diff --git a/API.md b/API.md
index eec1212..ee9eb08 100644
--- a/API.md
+++ b/API.md
@@ -323,7 +323,7 @@ Server-Authorization: Hawk mac="XIJRsMl/4oL+nn+vKoeVZPdCHXB4yJkNnBbTbHFZUYE=", h
 
 ## Browser Support and Considerations
 
-A browser script is provided for including using a `<script>` tag in [lib/browser.js](/lib/browser.js). It's also a [component](http://component.io/hueniverse/hawk).
+This library can be included in browser-based applications using Webpack or similar bundling technologies.
 
 **Hawk** relies on the _Server-Authorization_ and _WWW-Authenticate_ headers in its response to communicate with the client.
 Therefore, in case of CORS requests, it is important to consider sending _Access-Control-Expose-Headers_ with the value
@@ -334,7 +334,6 @@ can safely be accessed by the client (using getResponseHeader() on the XmlHttpRe
 Hawk client from authenticating the requests.You can read more about the why and how in this
 [article](http://www.html5rocks.com/en/tutorials/cors/#toc-adding-cors-support-to-the-server)
 
-
 # Single URI Authorization
 
 There are cases in which limited and short-term access to a protected resource is granted to a third party which does not
diff --git a/lib/browser.js b/lib/browser.js
deleted file mode 100755
index 19af128..0000000
--- a/lib/browser.js
+++ /dev/null
@@ -1,629 +0,0 @@
-'use strict';
-
-const hawk = {
-    internals: {}
-};
-
-
-hawk.client = {
-
-    // Generate an Authorization header for a given request
-
-    /*
-        uri: 'http://example.com/resource?a=b' or object generated by hawk.utils.parseUri()
-        method: HTTP verb (e.g. 'GET', 'POST')
-        options: {
-
-            // Required
-
-            credentials: {
-                id: 'dh37fgj492je',
-                key: 'aoijedoaijsdlaksjdl',
-                algorithm: 'sha256'                                 // 'sha1', 'sha256'
-            },
-
-            // Optional
-
-            ext: 'application-specific',                        // Application specific data sent via the ext attribute
-            timestamp: Date.now() / 1000,                       // A pre-calculated timestamp in seconds
-            nonce: '2334f34f',                                  // A pre-generated nonce
-            localtimeOffsetMsec: 400,                           // Time offset to sync with server time (ignored if timestamp provided)
-            payload: '{"some":"payload"}',                      // UTF-8 encoded string for body hash generation (ignored if hash provided)
-            contentType: 'application/json',                    // Payload content-type (ignored if hash provided)
-            hash: 'U4MKKSmiVxk37JCCrAVIjV=',                    // Pre-calculated payload hash
-            app: '24s23423f34dx',                               // Oz application id
-            dlg: '234sz34tww3sd'                                // Oz delegated-by application id
-        }
-    */
-
-    header: function (uri, method, options) {
-
-        // Validate inputs
-
-        if (!uri || (typeof uri !== 'string' && typeof uri !== 'object') ||
-            !method || typeof method !== 'string' ||
-            !options || typeof options !== 'object') {
-
-            throw new Error('Invalid argument type');
-        }
-
-        // Application time
-
-        const timestamp = options.timestamp || hawk.utils.nowSec(options.localtimeOffsetMsec);
-
-        // Validate credentials
-
-        const credentials = options.credentials;
-        if (!credentials ||
-            !credentials.id ||
-            !credentials.key ||
-            !credentials.algorithm) {
-
-            throw new Error('Invalid credentials');
-        }
-
-        if (hawk.crypto.algorithms.indexOf(credentials.algorithm) === -1) {
-            throw new Error('Unknown algorithm');
-        }
-
-        // Parse URI
-
-        if (typeof uri === 'string') {
-            uri = hawk.utils.parseUri(uri);
-        }
-
-        // Calculate signature
-
-        const artifacts = {
-            ts: timestamp,
-            nonce: options.nonce || hawk.utils.randomString(6),
-            method,
-            resource: uri.resource,
-            host: uri.host,
-            port: uri.port,
-            hash: options.hash,
-            ext: options.ext,
-            app: options.app,
-            dlg: options.dlg
-        };
-
-        // Calculate payload hash
-
-        if (!artifacts.hash &&
-            (options.payload || options.payload === '')) {
-
-            artifacts.hash = hawk.crypto.calculatePayloadHash(options.payload, credentials.algorithm, options.contentType);
-        }
-
-        const mac = hawk.crypto.calculateMac('header', credentials, artifacts);
-
-        // Construct header
-
-        const hasExt = artifacts.ext !== null && artifacts.ext !== undefined && artifacts.ext !== '';       // Other falsey values allowed
-        let header = 'Hawk id="' + credentials.id +
-                     '", ts="' + artifacts.ts +
-                     '", nonce="' + artifacts.nonce +
-                     (artifacts.hash ? '", hash="' + artifacts.hash : '') +
-                     (hasExt ? '", ext="' + hawk.utils.escapeHeaderAttribute(artifacts.ext) : '') +
-                     '", mac="' + mac + '"';
-
-        if (artifacts.app) {
-            header += ', app="' + artifacts.app +
-                      (artifacts.dlg ? '", dlg="' + artifacts.dlg : '') + '"';
-        }
-
-        return { artifacts, header };
-    },
-
-    // Generate a bewit value for a given URI
-
-    /*
-        uri: 'http://example.com/resource?a=b'
-        options: {
-
-            // Required
-
-            credentials: {
-            id: 'dh37fgj492je',
-            key: 'aoijedoaijsdlaksjdl',
-            algorithm: 'sha256'                             // 'sha1', 'sha256'
-            },
-            ttlSec: 60 * 60,                                    // TTL in seconds
-
-            // Optional
-
-            ext: 'application-specific',                        // Application specific data sent via the ext attribute
-            localtimeOffsetMsec: 400                            // Time offset to sync with server time
-         };
-    */
-
-    bewit: function (uri, options) {
-
-        // Validate inputs
-
-        if (!uri ||
-            (typeof uri !== 'string') ||
-            !options ||
-            typeof options !== 'object' ||
-            !options.ttlSec) {
-
-            throw new Error('Invalid inputs');
-        }
-
-        const ext = (options.ext === null || options.ext === undefined ? '' : options.ext);       // Zero is valid value
-
-        // Application time
-
-        const now = hawk.utils.nowSec(options.localtimeOffsetMsec);
-
-        // Validate credentials
-
-        const credentials = options.credentials;
-        if (!credentials ||
-            !credentials.id ||
-            !credentials.key ||
-            !credentials.algorithm) {
-
-            throw new Error('Invalid credentials');
-        }
-
-        if (hawk.crypto.algorithms.indexOf(credentials.algorithm) === -1) {
-            throw new Error('Unknown algorithm');
-        }
-
-        // Parse URI
-
-        uri = hawk.utils.parseUri(uri);
-
-        // Calculate signature
-
-        const exp = now + options.ttlSec;
-        const mac = hawk.crypto.calculateMac('bewit', credentials, {
-            ts: exp,
-            nonce: '',
-            method: 'GET',
-            resource: uri.resource,                            // Maintain trailing '?' and query params
-            host: uri.host,
-            port: uri.port,
-            ext
-        });
-
-        // Construct bewit: id\exp\mac\ext
-
-        const bewit = credentials.id + '\\' + exp + '\\' + mac + '\\' + ext;
-        return hawk.utils.base64urlEncode(bewit);
-    },
-
-    // Validate server response
-
-    /*
-        request:    object created via 'new XMLHttpRequest()' after response received or fetch API 'Response'
-        artifacts:  object received from header().artifacts
-        options: {
-            payload:    optional payload received
-            required:   specifies if a Server-Authorization header is required. Defaults to 'false'
-        }
-    */
-
-    authenticate: function (request, credentials, artifacts, options) {
-
-        options = options || {};
-
-        const getHeader = function (name) {
-
-            // Fetch API or plain headers
-
-            if (request.headers) {
-                return (typeof request.headers.get === 'function' ? request.headers.get(name) : request.headers[name]);
-            }
-
-            // XMLHttpRequest
-
-            return (request.getResponseHeader ? request.getResponseHeader(name) : request.getHeader(name));
-        };
-
-        const wwwAuthenticate = getHeader('www-authenticate');
-        if (wwwAuthenticate) {
-
-            // Parse HTTP WWW-Authenticate header
-
-            const wwwAttributes = hawk.utils.parseAuthorizationHeader(wwwAuthenticate, ['ts', 'tsm', 'error']);
-            if (!wwwAttributes) {
-                return false;
-            }
-
-            if (wwwAttributes.ts) {
-                const tsm = hawk.crypto.calculateTsMac(wwwAttributes.ts, credentials);
-                if (tsm !== wwwAttributes.tsm) {
-                    return false;
-                }
-
-                hawk.utils.setNtpSecOffset(wwwAttributes.ts - Math.floor(Date.now() / 1000));      // Keep offset at 1 second precision
-            }
-        }
-
-        // Parse HTTP Server-Authorization header
-
-        const serverAuthorization = getHeader('server-authorization');
-        if (!serverAuthorization) {
-            return !options.required;
-        }
-
-        const attributes = hawk.utils.parseAuthorizationHeader(serverAuthorization, ['mac', 'ext', 'hash']);
-        if (!attributes) {
-            return false;
-        }
-
-        const modArtifacts = {
-            ts: artifacts.ts,
-            nonce: artifacts.nonce,
-            method: artifacts.method,
-            resource: artifacts.resource,
-            host: artifacts.host,
-            port: artifacts.port,
-            hash: attributes.hash,
-            ext: attributes.ext,
-            app: artifacts.app,
-            dlg: artifacts.dlg
-        };
-
-        const mac = hawk.crypto.calculateMac('response', credentials, modArtifacts);
-        if (mac !== attributes.mac) {
-            return false;
-        }
-
-        if (options.payload === null ||
-            options.payload === undefined) {
-
-            return true;
-        }
-
-        if (!attributes.hash) {
-            return false;
-        }
-
-        const calculatedHash = hawk.crypto.calculatePayloadHash(options.payload, credentials.algorithm, getHeader('content-type'));
-        return (calculatedHash === attributes.hash);
-    },
-
-    message: function (host, port, message, options) {
-
-        // Validate inputs
-
-        if (!host || typeof host !== 'string' ||
-            !port || typeof port !== 'number' ||
-            message === null || message === undefined || typeof message !== 'string' ||
-            !options || typeof options !== 'object') {
-
-            throw new Error('Invalid inputs');
-        }
-
-        // Application time
-
-        const timestamp = options.timestamp || hawk.utils.nowSec(options.localtimeOffsetMsec);
-
-        // Validate credentials
-
-        const credentials = options.credentials;
-        if (!credentials ||
-            !credentials.id ||
-            !credentials.key ||
-            !credentials.algorithm) {
-
-            throw new Error('Invalid credentials');
-        }
-
-        if (hawk.crypto.algorithms.indexOf(credentials.algorithm) === -1) {
-            throw new Error('Unknown algorithm');
-        }
-
-        // Calculate signature
-
-        const artifacts = {
-            ts: timestamp,
-            nonce: options.nonce || hawk.utils.randomString(6),
-            host,
-            port,
-            hash: hawk.crypto.calculatePayloadHash(message, credentials.algorithm)
-        };
-
-        // Construct authorization
-
-        const result = {
-            id: credentials.id,
-            ts: artifacts.ts,
-            nonce: artifacts.nonce,
-            hash: artifacts.hash,
-            mac: hawk.crypto.calculateMac('message', credentials, artifacts)
-        };
-
-        return result;
-    },
-
-    authenticateTimestamp: function (message, credentials, updateClock) {               // updateClock defaults to true
-
-        const tsm = hawk.crypto.calculateTsMac(message.ts, credentials);
-        if (tsm !== message.tsm) {
-            return false;
-        }
-
-        if (updateClock !== false) {
-            hawk.utils.setNtpSecOffset(message.ts - Math.floor(Date.now() / 1000));     // Keep offset at 1 second precision
-        }
-
-        return true;
-    }
-};
-
-
-hawk.crypto = {
-
-    headerVersion: '1',
-
-    algorithms: ['sha1', 'sha256'],
-
-    calculateMac: function (type, credentials, options) {
-
-        const normalized = hawk.crypto.generateNormalizedString(type, options);
-
-        const hmac = CryptoJS['Hmac' + credentials.algorithm.toUpperCase()](normalized, credentials.key);
-        return hmac.toString(CryptoJS.enc.Base64);
-    },
-
-    generateNormalizedString: function (type, options) {
-
-        let normalized = 'hawk.' + hawk.crypto.headerVersion + '.' + type + '\n' +
-                         options.ts + '\n' +
-                         options.nonce + '\n' +
-                         (options.method || '').toUpperCase() + '\n' +
-                         (options.resource || '') + '\n' +
-                         options.host.toLowerCase() + '\n' +
-                         options.port + '\n' +
-                         (options.hash || '') + '\n';
-
-        if (options.ext) {
-            normalized += options.ext.replace(/\\/g, '\\\\').replace(/\n/g, '\\n');
-        }
-
-        normalized += '\n';
-
-        if (options.app) {
-            normalized += options.app + '\n' +
-                          (options.dlg || '') + '\n';
-        }
-
-        return normalized;
-    },
-
-    calculatePayloadHash: function (payload, algorithm, contentType) {
-
-        const hash = CryptoJS.algo[algorithm.toUpperCase()].create();
-        hash.update('hawk.' + hawk.crypto.headerVersion + '.payload\n');
-        hash.update(hawk.utils.parseContentType(contentType) + '\n');
-        hash.update(payload);
-        hash.update('\n');
-        return hash.finalize().toString(CryptoJS.enc.Base64);
-    },
-
-    calculateTsMac: function (ts, credentials) {
-
-        const hash = CryptoJS['Hmac' + credentials.algorithm.toUpperCase()]('hawk.' + hawk.crypto.headerVersion + '.ts\n' + ts + '\n', credentials.key);
-        return hash.toString(CryptoJS.enc.Base64);
-    }
-};
-
-
-// localStorage compatible interface
-
-hawk.internals.LocalStorage = function () {
-
-    this._cache = {};
-    this.length = 0;
-
-    this.getItem = function (key) {
-
-        return this._cache.hasOwnProperty(key) ? String(this._cache[key]) : null;
-    };
-
-    this.setItem = function (key, value) {
-
-        this._cache[key] = String(value);
-        this.length = Object.keys(this._cache).length;
-    };
-
-    this.removeItem = function (key) {
-
-        delete this._cache[key];
-        this.length = Object.keys(this._cache).length;
-    };
-
-    this.clear = function () {
-
-        this._cache = {};
-        this.length = 0;
-    };
-
-    this.key = function (i) {
-
-        return Object.keys(this._cache)[i || 0];
-    };
-};
-
-
-hawk.utils = {
-
-    storage: new hawk.internals.LocalStorage(),
-
-    setStorage: function (storage) {
-
-        const ntpOffset = hawk.utils.storage.getItem('hawk_ntp_offset');
-        hawk.utils.storage = storage;
-        if (ntpOffset) {
-            hawk.utils.setNtpSecOffset(ntpOffset);
-        }
-    },
-
-    setNtpSecOffset: function (offset) {
-
-        try {
-            hawk.utils.storage.setItem('hawk_ntp_offset', offset);
-        }
-        catch (err) {
-            console.error('[hawk] could not write to storage.');
-            console.error(err);
-        }
-    },
-
-    getNtpSecOffset: function () {
-
-        const offset = hawk.utils.storage.getItem('hawk_ntp_offset');
-        if (!offset) {
-            return 0;
-        }
-
-        return parseInt(offset, 10);
-    },
-
-    now: function (localtimeOffsetMsec) {
-
-        return Date.now() + (localtimeOffsetMsec || 0) + (hawk.utils.getNtpSecOffset() * 1000);
-    },
-
-    nowSec: function (localtimeOffsetMsec) {
-
-        return Math.floor(hawk.utils.now(localtimeOffsetMsec) / 1000);
-    },
-
-    escapeHeaderAttribute: function (attribute) {
-
-        return attribute.replace(/\\/g, '\\\\').replace(/\"/g, '\\"');
-    },
-
-    parseContentType: function (header) {
-
-        if (!header) {
-            return '';
-        }
-
-        return header.split(';')[0].replace(/^\s+|\s+$/g, '').toLowerCase();
-    },
-
-    parseAuthorizationHeader: function (header, keys) {
-
-        if (!header) {
-            return null;
-        }
-
-        const headerParts = header.match(/^(\w+)(?:\s+(.*))?$/);       // Header: scheme[ something]
-        if (!headerParts) {
-            return null;
-        }
-
-        const scheme = headerParts[1];
-        if (scheme.toLowerCase() !== 'hawk') {
-            return null;
-        }
-
-        const attributesString = headerParts[2];
-        if (!attributesString) {
-            return null;
-        }
-
-        const attributes = {};
-        const verify = attributesString.replace(/(\w+)="([^"\\]*)"\s*(?:,\s*|$)/g, ($0, $1, $2) => {
-
-            // Check valid attribute names
-
-            if (keys.indexOf($1) === -1) {
-                return;
-            }
-
-            // Allowed attribute value characters: !#$%&'()*+,-./:;<=>?@[]^_`{|}~ and space, a-z, A-Z, 0-9
-
-            if ($2.match(/^[ \w\!#\$%&'\(\)\*\+,\-\.\/\:;<\=>\?@\[\]\^`\{\|\}~]+$/) === null) {
-                return;
-            }
-
-            // Check for duplicates
-
-            if (attributes.hasOwnProperty($1)) {
-                return;
-            }
-
-            attributes[$1] = $2;
-            return '';
-        });
-
-        if (verify !== '') {
-            return null;
-        }
-
-        return attributes;
-    },
-
-    randomString: function (size) {
-
-        const randomSource = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-        const len = randomSource.length;
-
-        const result = [];
-        for (let i = 0; i < size; ++i) {
-            result[i] = randomSource[Math.floor(Math.random() * len)];
-        }
-
-        return result.join('');
-    },
-
-    //          1                        2             3      4
-    uriRegex: /^([^:]+)\:\/\/(?:[^@/]*@)?([^\/:]+)(?:\:(\d+))?([^#]*)(?:#.*)?$/,       // scheme://credentials@host:port/resource#fragment
-    parseUri: function (input) {
-
-        const parts = input.match(hawk.utils.uriRegex);
-        if (!parts) {
-            return { host: '', port: '', resource: '' };
-        }
-
-        const scheme = parts[1].toLowerCase();
-        const uri = {
-            host: parts[2],
-            port: parts[3] || (scheme === 'http' ? '80' : (scheme === 'https' ? '443' : '')),
-            resource: parts[4]
-        };
-
-        return uri;
-    },
-
-    base64urlEncode: function (value) {
-
-        const wordArray = CryptoJS.enc.Utf8.parse(value);
-        const encoded = CryptoJS.enc.Base64.stringify(wordArray);
-        return encoded.replace(/\+/g, '-').replace(/\//g, '_').replace(/\=/g, '');
-    }
-};
-
-
-// $lab:coverage:off$
-/* eslint-disable */
-
-// Based on: Crypto-JS v3.1.2
-// Copyright (c) 2009-2013, Jeff Mott. All rights reserved.
-// http://code.google.com/p/crypto-js/
-// http://code.google.com/p/crypto-js/wiki/License
-
-var CryptoJS = CryptoJS || function (h, r) { var k = {}, l = k.lib = {}, n = function () { }, f = l.Base = { extend: function (a) { n.prototype = this; var b = new n; a && b.mixIn(a); b.hasOwnProperty("init") || (b.init = function () { b.$super.init.apply(this, arguments) }); b.init.prototype = b; b.$super = this; return b }, create: function () { var a = this.extend(); a.init.apply(a, arguments); return a }, init: function () { }, mixIn: function (a) { for (let b in a) a.hasOwnProperty(b) && (this[b] = a[b]); a.hasOwnProperty("toString") && (this.toString = a.toString) }, clone: function () { return this.init.prototype.extend(this) } }, j = l.WordArray = f.extend({ init: function (a, b) { a = this.words = a || []; this.sigBytes = b != r ? b : 4 * a.length }, toString: function (a) { return (a || s).stringify(this) }, concat: function (a) { var b = this.words, d = a.words, c = this.sigBytes; a = a.sigBytes; this.clamp(); if (c % 4) for (let e = 0; e < a; e++) b[c + e >>> 2] |= (d[e >>> 2] >>> 24 - 8 * (e % 4) & 255) << 24 - 8 * ((c + e) % 4); else if (65535 < d.length) for (let e = 0; e < a; e += 4) b[c + e >>> 2] = d[e >>> 2]; else b.push.apply(b, d); this.sigBytes += a; return this }, clamp: function () { var a = this.words, b = this.sigBytes; a[b >>> 2] &= 4294967295 << 32 - 8 * (b % 4); a.length = h.ceil(b / 4) }, clone: function () { var a = f.clone.call(this); a.words = this.words.slice(0); return a }, random: function (a) { for (let b = [], d = 0; d < a; d += 4) b.push(4294967296 * h.random() | 0); return new j.init(b, a) } }), m = k.enc = {}, s = m.Hex = { stringify: function (a) { var b = a.words; a = a.sigBytes; for (var d = [], c = 0; c < a; c++) { var e = b[c >>> 2] >>> 24 - 8 * (c % 4) & 255; d.push((e >>> 4).toString(16)); d.push((e & 15).toString(16)) } return d.join("") }, parse: function (a) { for (var b = a.length, d = [], c = 0; c < b; c += 2) d[c >>> 3] |= parseInt(a.substr(c, 2), 16) << 24 - 4 * (c % 8); return new j.init(d, b / 2) } }, p = m.Latin1 = { stringify: function (a) { var b = a.words; a = a.sigBytes; for (var d = [], c = 0; c < a; c++) d.push(String.fromCharCode(b[c >>> 2] >>> 24 - 8 * (c % 4) & 255)); return d.join("") }, parse: function (a) { for (var b = a.length, d = [], c = 0; c < b; c++) d[c >>> 2] |= (a.charCodeAt(c) & 255) << 24 - 8 * (c % 4); return new j.init(d, b) } }, t = m.Utf8 = { stringify: function (a) { try { return decodeURIComponent(escape(p.stringify(a))) } catch (b) { throw Error("Malformed UTF-8 data"); } }, parse: function (a) { return p.parse(unescape(encodeURIComponent(a))) } }, q = l.BufferedBlockAlgorithm = f.extend({ reset: function () { this._data = new j.init; this._nDataBytes = 0 }, _append: function (a) { "string" == typeof a && (a = t.parse(a)); this._data.concat(a); this._nDataBytes += a.sigBytes }, _process: function (a) { var b = this._data, d = b.words, c = b.sigBytes, e = this.blockSize, f = c / (4 * e), f = a ? h.ceil(f) : h.max((f | 0) - this._minBufferSize, 0); a = f * e; c = h.min(4 * a, c); if (a) { for (var g = 0; g < a; g += e) this._doProcessBlock(d, g); g = d.splice(0, a); b.sigBytes -= c } return new j.init(g, c) }, clone: function () { var a = f.clone.call(this); a._data = this._data.clone(); return a }, _minBufferSize: 0 }); l.Hasher = q.extend({ cfg: f.extend(), init: function (a) { this.cfg = this.cfg.extend(a); this.reset() }, reset: function () { q.reset.call(this); this._doReset() }, update: function (a) { this._append(a); this._process(); return this }, finalize: function (a) { a && this._append(a); return this._doFinalize() }, blockSize: 16, _createHelper: function (a) { return function (b, d) { return (new a.init(d)).finalize(b) } }, _createHmacHelper: function (a) { return function (b, d) { return (new u.HMAC.init(a, d)).finalize(b) } } }); var u = k.algo = {}; return k }(Math);
-(() => { var k = CryptoJS, b = k.lib, m = b.WordArray, l = b.Hasher, d = [], b = k.algo.SHA1 = l.extend({ _doReset: function () { this._hash = new m.init([1732584193, 4023233417, 2562383102, 271733878, 3285377520]) }, _doProcessBlock: function (n, p) { for (var a = this._hash.words, e = a[0], f = a[1], h = a[2], j = a[3], b = a[4], c = 0; 80 > c; c++) { if (16 > c) d[c] = n[p + c] | 0; else { var g = d[c - 3] ^ d[c - 8] ^ d[c - 14] ^ d[c - 16]; d[c] = g << 1 | g >>> 31 } g = (e << 5 | e >>> 27) + b + d[c]; g = 20 > c ? g + ((f & h | ~f & j) + 1518500249) : 40 > c ? g + ((f ^ h ^ j) + 1859775393) : 60 > c ? g + ((f & h | f & j | h & j) - 1894007588) : g + ((f ^ h ^ j) - 899497514); b = j; j = h; h = f << 30 | f >>> 2; f = e; e = g } a[0] = a[0] + e | 0; a[1] = a[1] + f | 0; a[2] = a[2] + h | 0; a[3] = a[3] + j | 0; a[4] = a[4] + b | 0 }, _doFinalize: function () { var b = this._data, d = b.words, a = 8 * this._nDataBytes, e = 8 * b.sigBytes; d[e >>> 5] |= 128 << 24 - e % 32; d[(e + 64 >>> 9 << 4) + 14] = Math.floor(a / 4294967296); d[(e + 64 >>> 9 << 4) + 15] = a; b.sigBytes = 4 * d.length; this._process(); return this._hash }, clone: function () { var b = l.clone.call(this); b._hash = this._hash.clone(); return b } }); k.SHA1 = l._createHelper(b); k.HmacSHA1 = l._createHmacHelper(b) })();
-(function (k) { for (var g = CryptoJS, h = g.lib, v = h.WordArray, j = h.Hasher, h = g.algo, s = [], t = [], u = function (q) { return 4294967296 * (q - (q | 0)) | 0 }, l = 2, b = 0; 64 > b;) { var d; a: { d = l; for (var w = k.sqrt(d), r = 2; r <= w; r++) if (!(d % r)) { d = !1; break a } d = !0 } d && (8 > b && (s[b] = u(k.pow(l, 0.5))), t[b] = u(k.pow(l, 1 / 3)), b++); l++ } var n = [], h = h.SHA256 = j.extend({ _doReset: function () { this._hash = new v.init(s.slice(0)) }, _doProcessBlock: function (q, h) { for (var a = this._hash.words, c = a[0], d = a[1], b = a[2], k = a[3], f = a[4], g = a[5], j = a[6], l = a[7], e = 0; 64 > e; e++) { if (16 > e) n[e] = q[h + e] | 0; else { var m = n[e - 15], p = n[e - 2]; n[e] = ((m << 25 | m >>> 7) ^ (m << 14 | m >>> 18) ^ m >>> 3) + n[e - 7] + ((p << 15 | p >>> 17) ^ (p << 13 | p >>> 19) ^ p >>> 10) + n[e - 16] } m = l + ((f << 26 | f >>> 6) ^ (f << 21 | f >>> 11) ^ (f << 7 | f >>> 25)) + (f & g ^ ~f & j) + t[e] + n[e]; p = ((c << 30 | c >>> 2) ^ (c << 19 | c >>> 13) ^ (c << 10 | c >>> 22)) + (c & d ^ c & b ^ d & b); l = j; j = g; g = f; f = k + m | 0; k = b; b = d; d = c; c = m + p | 0 } a[0] = a[0] + c | 0; a[1] = a[1] + d | 0; a[2] = a[2] + b | 0; a[3] = a[3] + k | 0; a[4] = a[4] + f | 0; a[5] = a[5] + g | 0; a[6] = a[6] + j | 0; a[7] = a[7] + l | 0 }, _doFinalize: function () { var d = this._data, b = d.words, a = 8 * this._nDataBytes, c = 8 * d.sigBytes; b[c >>> 5] |= 128 << 24 - c % 32; b[(c + 64 >>> 9 << 4) + 14] = k.floor(a / 4294967296); b[(c + 64 >>> 9 << 4) + 15] = a; d.sigBytes = 4 * b.length; this._process(); return this._hash }, clone: function () { var b = j.clone.call(this); b._hash = this._hash.clone(); return b } }); g.SHA256 = j._createHelper(h); g.HmacSHA256 = j._createHmacHelper(h) })(Math);
-(() => { var c = CryptoJS, k = c.enc.Utf8; c.algo.HMAC = c.lib.Base.extend({ init: function (a, b) { a = this._hasher = new a.init; "string" == typeof b && (b = k.parse(b)); var c = a.blockSize, e = 4 * c; b.sigBytes > e && (b = a.finalize(b)); b.clamp(); for (var f = this._oKey = b.clone(), g = this._iKey = b.clone(), h = f.words, j = g.words, d = 0; d < c; d++) h[d] ^= 1549556828, j[d] ^= 909522486; f.sigBytes = g.sigBytes = e; this.reset() }, reset: function () { var a = this._hasher; a.reset(); a.update(this._iKey) }, update: function (a) { this._hasher.update(a); return this }, finalize: function (a) { var b = this._hasher; a = b.finalize(a); b.reset(); return b.finalize(this._oKey.clone().concat(a)) } }) })();
-(() => { var h = CryptoJS, j = h.lib.WordArray; h.enc.Base64 = { stringify: function (b) { var e = b.words, f = b.sigBytes, c = this._map; b.clamp(); b = []; for (var a = 0; a < f; a += 3) for (var d = (e[a >>> 2] >>> 24 - 8 * (a % 4) & 255) << 16 | (e[a + 1 >>> 2] >>> 24 - 8 * ((a + 1) % 4) & 255) << 8 | e[a + 2 >>> 2] >>> 24 - 8 * ((a + 2) % 4) & 255, g = 0; 4 > g && a + 0.75 * g < f; g++) b.push(c.charAt(d >>> 6 * (3 - g) & 63)); if (e = c.charAt(64)) for (; b.length % 4;) b.push(e); return b.join("") }, parse: function (b) { var e = b.length, f = this._map, c = f.charAt(64); c && (c = b.indexOf(c), -1 != c && (e = c)); for (var c = [], a = 0, d = 0; d < e; d++) if (d % 4) { var g = f.indexOf(b.charAt(d - 1)) << 2 * (d % 4), h = f.indexOf(b.charAt(d)) >>> 6 - 2 * (d % 4); c[a >>> 2] |= (g | h) << 24 - 8 * (a % 4); a++ } return j.create(c, a) }, _map: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=" } })();
-
-
-hawk.crypto.utils = CryptoJS;
-
-// Export if used as a module
-
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = hawk;
-}
-
-/* eslint-enable */
-// $lab:coverage:on$
diff --git a/test/browser.js b/test/browser.js
deleted file mode 100755
index aae8794..0000000
--- a/test/browser.js
+++ /dev/null
@@ -1,1449 +0,0 @@
-'use strict';
-
-const Code = require('@hapi/code');
-const Hawk = require('..');
-const Hoek = require('@hapi/hoek');
-const Lab = require('@hapi/lab');
-
-const Browser = require('../lib/browser');
-
-
-const internals = {};
-
-
-// Test shortcuts
-
-const { describe, it } = exports.lab = Lab.script();
-const expect = Code.expect;
-
-
-describe('Browser', () => {
-
-    const credentialsFunc = function (id) {
-
-        return {
-            id,
-            key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-            algorithm: (id === '1' ? 'sha1' : 'sha256'),
-            user: 'steve'
-        };
-    };
-
-    describe('client', () => {
-
-        describe('header()', () => {
-
-            it('generates a header then successfully parse it (configuration)', async () => {
-
-                const req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080
-                };
-
-                const credentials1 = credentialsFunc('123456');
-
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data' }).header;
-                expect(req.authorization).to.exist();
-
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-            });
-
-            it('generates a header then successfully parse it (node request)', async () => {
-
-                const req = {
-                    method: 'POST',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        host: 'example.com:8080',
-                        'content-type': 'text/plain;x=y'
-                    }
-                };
-
-                const payload = 'some not so random text';
-
-                const credentials1 = credentialsFunc('123456');
-
-                const reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload, contentType: req.headers['content-type'] });
-                req.headers.authorization = reqHeader.header;
-
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(() => Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.not.throw();
-            });
-
-            it('generates a header then successfully parse it (time offset)', async () => {
-
-                const req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080
-                };
-
-                const credentials1 = credentialsFunc('123456');
-
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', localtimeOffsetMsec: 100000 }).header;
-                expect(req.authorization).to.exist();
-
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc, { localtimeOffsetMsec: 100000 });
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-            });
-
-            it('generates a header then successfully parse it (no server header options)', async () => {
-
-                const req = {
-                    method: 'POST',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        host: 'example.com:8080',
-                        'content-type': 'text/plain;x=y'
-                    }
-                };
-
-                const payload = 'some not so random text';
-
-                const credentials1 = credentialsFunc('123456');
-
-                const reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload, contentType: req.headers['content-type'] });
-                req.headers.authorization = reqHeader.header;
-
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(() => Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.not.throw();
-
-                const res = {
-                    headers: {
-                        'content-type': 'text/plain'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts);
-                expect(res.headers['server-authorization']).to.exist();
-
-                expect(Browser.client.authenticate(res, credentials2, artifacts)).to.equal(true);
-            });
-
-            it('generates a header then successfully parse it (no server header)', async () => {
-
-                const req = {
-                    method: 'POST',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        host: 'example.com:8080',
-                        'content-type': 'text/plain;x=y'
-                    }
-                };
-
-                const payload = 'some not so random text';
-
-                const credentials1 = credentialsFunc('123456');
-
-                const reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload, contentType: req.headers['content-type'] });
-                req.headers.authorization = reqHeader.header;
-
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(() => Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.not.throw();
-
-                const res = {
-                    headers: {
-                        'content-type': 'text/plain'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                expect(Browser.client.authenticate(res, credentials2, artifacts)).to.equal(true);
-            });
-
-            it('generates a header with stale ts and successfully authenticate on second call', async () => {
-
-                const req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080
-                };
-
-                const credentials = credentialsFunc('123456');
-
-                Browser.utils.setNtpSecOffset(60 * 60 * 1000);
-                const { header } = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials, ext: 'some-app-data' });
-                req.authorization = header;
-                expect(req.authorization).to.exist();
-
-                const err = await expect(Hawk.server.authenticate(req, credentialsFunc)).to.reject('Stale timestamp');
-
-                const res = {
-                    headers: {
-                        'www-authenticate': err.output.headers['WWW-Authenticate']
-                    },
-                    getResponseHeader: function (lookup) {
-
-                        return res.headers[lookup.toLowerCase()];
-                    }
-                };
-
-                expect(Browser.utils.getNtpSecOffset()).to.equal(60 * 60 * 1000);
-                expect(Browser.client.authenticate(res, err.credentials, header.artifacts)).to.equal(true);
-                expect(Browser.utils.getNtpSecOffset()).to.equal(0);
-
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: err.credentials, ext: 'some-app-data' }).header;
-                expect(req.authorization).to.exist();
-
-                const { credentials: credentials3, artifacts: artifacts3 } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials3.user).to.equal('steve');
-                expect(artifacts3.ext).to.equal('some-app-data');
-            });
-
-            it('generates a header with stale ts and successfully authenticate on second call (manual localStorage)', async () => {
-
-                const req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080
-                };
-
-                const credentials = credentialsFunc('123456');
-
-                const localStorage = new Browser.internals.LocalStorage();
-
-                Browser.utils.setStorage(localStorage);
-
-                Browser.utils.setNtpSecOffset(60 * 60 * 1000);
-                const { header } = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials, ext: 'some-app-data' });
-                req.authorization = header;
-                expect(req.authorization).to.exist();
-
-                const err = await expect(Hawk.server.authenticate(req, credentialsFunc)).to.reject('Stale timestamp');
-
-                const res = {
-                    headers: {
-                        'www-authenticate': err.output.headers['WWW-Authenticate']
-                    },
-                    getResponseHeader: function (lookup) {
-
-                        return res.headers[lookup.toLowerCase()];
-                    }
-                };
-
-                expect(parseInt(localStorage.getItem('hawk_ntp_offset'))).to.equal(60 * 60 * 1000);
-                expect(Browser.utils.getNtpSecOffset()).to.equal(60 * 60 * 1000);
-                expect(Browser.client.authenticate(res, err.credentials, header.artifacts)).to.equal(true);
-                expect(Browser.utils.getNtpSecOffset()).to.equal(0);
-                expect(parseInt(localStorage.getItem('hawk_ntp_offset'))).to.equal(0);
-
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: err.credentials, ext: 'some-app-data' }).header;
-                expect(req.authorization).to.exist();
-
-                const { credentials: credentials3, artifacts: artifacts3 } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials3.user).to.equal('steve');
-                expect(artifacts3.ext).to.equal('some-app-data');
-            });
-
-            it('generates a header then fails to parse it (missing server header hash)', async () => {
-
-                const req = {
-                    method: 'POST',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        host: 'example.com:8080',
-                        'content-type': 'text/plain;x=y'
-                    }
-                };
-
-                const payload = 'some not so random text';
-
-                const credentials1 = credentialsFunc('123456');
-
-                const reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload, contentType: req.headers['content-type'] });
-                req.headers.authorization = reqHeader.header;
-
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(() => Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.not.throw();
-
-                const res = {
-                    headers: {
-                        'content-type': 'text/plain'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts);
-                expect(res.headers['server-authorization']).to.exist();
-
-                expect(Browser.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(false);
-            });
-
-            it('generates a header then successfully parse it (with hash)', async () => {
-
-                const req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080
-                };
-
-                const credentials1 = credentialsFunc('123456');
-
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).header;
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-            });
-
-            it('generates a header then successfully parse it then validate payload', async () => {
-
-                const req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080
-                };
-
-                const credentials1 = credentialsFunc('123456');
-
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).header;
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(() => Hawk.server.authenticatePayload('hola!', credentials2, artifacts)).to.not.throw();
-                expect(() => Hawk.server.authenticatePayload('hello!', credentials2, artifacts)).to.throw('Bad payload hash');
-            });
-
-            it('generates a header then successfully parse it (app)', async () => {
-
-                const req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080
-                };
-
-                const credentials1 = credentialsFunc('123456');
-
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', app: 'asd23ased' }).header;
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(artifacts.app).to.equal('asd23ased');
-            });
-
-            it('generates a header then successfully parse it (app, dlg)', async () => {
-
-                const req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080
-                };
-
-                const credentials1 = credentialsFunc('123456');
-
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', app: 'asd23ased', dlg: '23434szr3q4d' }).header;
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(artifacts.app).to.equal('asd23ased');
-                expect(artifacts.dlg).to.equal('23434szr3q4d');
-            });
-
-            it('generates a header then fail authentication due to bad hash', async () => {
-
-                const req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080
-                };
-
-                const credentials1 = credentialsFunc('123456');
-
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, payload: 'hola!', ext: 'some-app-data' }).header;
-                await expect(Hawk.server.authenticate(req, credentialsFunc, { payload: 'byebye!' })).to.reject('Bad payload hash');
-            });
-
-            it('generates a header for one resource then fail to authenticate another', async () => {
-
-                const req = {
-                    method: 'GET',
-                    url: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: 8080
-                };
-
-                const credentials1 = credentialsFunc('123456');
-
-                req.authorization = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data' }).header;
-                req.url = '/something/else';
-
-                const err = await expect(Hawk.server.authenticate(req, credentialsFunc)).to.reject();
-                expect(err.credentials).to.exist();
-            });
-
-            it('returns a valid authorization header (sha1)', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha1'
-                };
-
-                const { header } = Browser.client.header('http://example.net/somewhere/over/the/rainbow', 'POST', { credentials, ext: 'Bazinga!', timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about' });
-                expect(header).to.equal('Hawk id="123456", ts="1353809207", nonce="Ygvqdz", hash="bsvY3IfUllw6V5rvk4tStEvpBhE=", ext="Bazinga!", mac="qbf1ZPG/r/e06F4ht+T77LXi5vw="');
-            });
-
-            it('returns a valid authorization header (sha256)', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                const { header } = Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials, ext: 'Bazinga!', timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain' });
-                expect(header).to.equal('Hawk id="123456", ts="1353809207", nonce="Ygvqdz", hash="2QfCt3GuY9HQnHWyWD3wX68ZOKbynqlfYmuO2ZBRqtY=", ext="Bazinga!", mac="q1CwFoSHzPZSkbIvl0oYlD+91rBUEvFk763nMjMndj8="');
-            });
-
-            it('returns a valid authorization header (empty payload)', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha1'
-                };
-
-                const { header } = Browser.client.header('http://example.net/somewhere/over/the/rainbow', 'POST', { credentials, ext: 'Bazinga!', timestamp: 1353809207, nonce: 'Ygvqdz', payload: '' });
-                expect(header).to.equal('Hawk id=\"123456\", ts=\"1353809207\", nonce=\"Ygvqdz\", hash=\"404ghL7K+hfyhByKKejFBRGgTjU=\", ext=\"Bazinga!\", mac=\"Bh1sj1DOfFRWOdi3ww52nLCJdBE=\"');
-            });
-
-            it('returns a valid authorization header (no ext)', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                const { header } = Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials, timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain' });
-                expect(header).to.equal('Hawk id="123456", ts="1353809207", nonce="Ygvqdz", hash="2QfCt3GuY9HQnHWyWD3wX68ZOKbynqlfYmuO2ZBRqtY=", mac="HTgtd0jPI6E4izx8e4OHdO36q00xFCU0FolNq3RiCYs="');
-            });
-
-            it('returns a valid authorization header (null ext)', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                const { header } = Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials, timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain', ext: null });
-                expect(header).to.equal('Hawk id="123456", ts="1353809207", nonce="Ygvqdz", hash="2QfCt3GuY9HQnHWyWD3wX68ZOKbynqlfYmuO2ZBRqtY=", mac="HTgtd0jPI6E4izx8e4OHdO36q00xFCU0FolNq3RiCYs="');
-            });
-
-            it('returns a valid authorization header (uri object)', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                const uri = Browser.utils.parseUri('https://example.net/somewhere/over/the/rainbow');
-                const { header } = Browser.client.header(uri, 'POST', { credentials, timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain' });
-                expect(header).to.equal('Hawk id="123456", ts="1353809207", nonce="Ygvqdz", hash="2QfCt3GuY9HQnHWyWD3wX68ZOKbynqlfYmuO2ZBRqtY=", mac="HTgtd0jPI6E4izx8e4OHdO36q00xFCU0FolNq3RiCYs="');
-            });
-
-            it('errors on missing options', () => {
-
-                expect(() => Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST')).to.throw('Invalid argument type');
-            });
-
-            it('errors on invalid options', () => {
-
-                expect(() => Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', 'xyz')).to.throw('Invalid argument type');
-            });
-
-            it('errors on empty uri', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                expect(() => Browser.client.header('', 'POST', { credentials, timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain' })).to.throw('Invalid argument type');
-            });
-
-            it('errors on invalid uri', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                expect(() => Browser.client.header(4, 'POST', { credentials, timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain' })).to.throw('Invalid argument type');
-            });
-
-            it('errors on missing method', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                expect(() => Browser.client.header('https://example.net/somewhere/over/the/rainbow', '', { credentials, timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain' })).to.throw('Invalid argument type');
-            });
-
-            it('errors on invalid method', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                expect(() => Browser.client.header('https://example.net/somewhere/over/the/rainbow', 5, { credentials, timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain' })).to.throw('Invalid argument type');
-            });
-
-            it('errors on missing credentials', () => {
-
-                expect(() => Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { ext: 'Bazinga!', timestamp: 1353809207 })).to.throw('Invalid credentials');
-            });
-
-            it('errors on invalid credentials (id)', () => {
-
-                const credentials = {
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                expect(() => Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials, ext: 'Bazinga!', timestamp: 1353809207 })).to.throw('Invalid credentials');
-            });
-
-            it('errors on invalid credentials (key)', () => {
-
-                const credentials = {
-                    id: '123456',
-                    algorithm: 'sha256'
-                };
-
-                expect(() => Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials, ext: 'Bazinga!', timestamp: 1353809207 })).to.throw('Invalid credentials');
-            });
-
-            it('errors on invalid credentials (algorithm)', () => {
-
-                const credentials = {
-                    key: '2983d45yun89q',
-                    id: '123456'
-                };
-
-                expect(() => Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials, ext: 'Bazinga!', timestamp: 1353809207 })).to.throw('Invalid credentials');
-            });
-
-            it('errors on invalid algorithm', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'hmac-sha-0'
-                };
-
-                expect(() => Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', { credentials, payload: 'something, anything!', ext: 'Bazinga!', timestamp: 1353809207 })).to.throw('Unknown algorithm');
-            });
-
-            it('uses a pre-calculated payload hash', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                const options = { credentials, ext: 'Bazinga!', timestamp: 1353809207, nonce: 'Ygvqdz', payload: 'something to write about', contentType: 'text/plain' };
-                options.hash = Browser.crypto.calculatePayloadHash(options.payload, credentials.algorithm, options.contentType);
-                const { header } = Browser.client.header('https://example.net/somewhere/over/the/rainbow', 'POST', options);
-                expect(header).to.equal('Hawk id="123456", ts="1353809207", nonce="Ygvqdz", hash="2QfCt3GuY9HQnHWyWD3wX68ZOKbynqlfYmuO2ZBRqtY=", ext="Bazinga!", mac="q1CwFoSHzPZSkbIvl0oYlD+91rBUEvFk763nMjMndj8="');
-            });
-        });
-
-        describe('bewit()', () => {
-
-            it('should generate a bewit then successfully authenticate it', async () => {
-
-                const req = {
-                    method: 'GET',
-                    url: '/resource/4?a=1&b=2',
-                    host: 'example.com',
-                    port: 80
-                };
-
-                const credentials1 = credentialsFunc('123456');
-
-                const bewit = Browser.client.bewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials1, ttlSec: 60 * 60 * 24 * 365 * 100, ext: 'some-app-data' });
-                req.url += '&bewit=' + bewit;
-
-                const { credentials: credentials2, attributes } = await Hawk.uri.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(attributes.ext).to.equal('some-app-data');
-            });
-
-            it('should generate a bewit then successfully authenticate it (no ext)', async () => {
-
-                const req = {
-                    method: 'GET',
-                    url: '/resource/4?a=1&b=2',
-                    host: 'example.com',
-                    port: 80
-                };
-
-                const credentials1 = credentialsFunc('123456');
-
-                const bewit = Browser.client.bewit('http://example.com/resource/4?a=1&b=2', { credentials: credentials1, ttlSec: 60 * 60 * 24 * 365 * 100 });
-                req.url += '&bewit=' + bewit;
-
-                const { credentials: credentials2 } = await Hawk.uri.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-            });
-
-            it('returns a valid bewit value', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                const bewit = Browser.client.bewit('https://example.com/somewhere/over/the/rainbow', { credentials, ttlSec: 300, localtimeOffsetMsec: 1356420407232 - Hawk.utils.now(), ext: 'xandyandz' });
-                expect(bewit).to.equal('MTIzNDU2XDEzNTY0MjA3MDdca3NjeHdOUjJ0SnBQMVQxekRMTlBiQjVVaUtJVTl0T1NKWFRVZEc3WDloOD1ceGFuZHlhbmR6');
-            });
-
-            it('returns a valid bewit value (explicit HTTP port)', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                const bewit = Browser.client.bewit('http://example.com:8080/somewhere/over/the/rainbow', { credentials, ttlSec: 300, localtimeOffsetMsec: 1356420407232 - Hawk.utils.now(), ext: 'xandyandz' });
-                expect(bewit).to.equal('MTIzNDU2XDEzNTY0MjA3MDdcaFpiSjNQMmNLRW80a3kwQzhqa1pBa1J5Q1p1ZWc0V1NOYnhWN3ZxM3hIVT1ceGFuZHlhbmR6');
-            });
-
-            it('returns a valid bewit value (explicit HTTPS port)', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                const bewit = Browser.client.bewit('https://example.com:8043/somewhere/over/the/rainbow', { credentials, ttlSec: 300, localtimeOffsetMsec: 1356420407232 - Hawk.utils.now(), ext: 'xandyandz' });
-                expect(bewit).to.equal('MTIzNDU2XDEzNTY0MjA3MDdcL2t4UjhwK0xSaTdvQTRnUXc3cWlxa3BiVHRKYkR4OEtRMC9HRUwvVytTUT1ceGFuZHlhbmR6');
-            });
-
-            it('returns a valid bewit value (null ext)', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                const bewit = Browser.client.bewit('https://example.com/somewhere/over/the/rainbow', { credentials, ttlSec: 300, localtimeOffsetMsec: 1356420407232 - Hawk.utils.now(), ext: null });
-                expect(bewit).to.equal('MTIzNDU2XDEzNTY0MjA3MDdcSUdZbUxnSXFMckNlOEN4dktQczRKbFdJQStValdKSm91d2dBUmlWaENBZz1c');
-            });
-
-            it('errors on invalid options', () => {
-
-                expect(() => Browser.client.bewit('https://example.com/somewhere/over/the/rainbow', 4)).to.throw('Invalid inputs');
-            });
-
-            it('errors on missing options.ttlSec', () => {
-
-                expect(() => Browser.client.bewit('https://example.com/somewhere/over/the/rainbow', {})).to.throw('Invalid inputs');
-            });
-
-            it('errors on missing uri', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                expect(() => Browser.client.bewit('', { credentials, ttlSec: 300, localtimeOffsetMsec: 1356420407232 - Hawk.utils.now(), ext: 'xandyandz' })).to.throw('Invalid inputs');
-            });
-
-            it('errors on invalid uri', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                expect(() => Browser.client.bewit(5, { credentials, ttlSec: 300, localtimeOffsetMsec: 1356420407232 - Hawk.utils.now(), ext: 'xandyandz' })).to.throw('Invalid inputs');
-            });
-
-            it('errors on invalid credentials (id)', () => {
-
-                const credentials = {
-                    key: '2983d45yun89q',
-                    algorithm: 'sha256'
-                };
-
-                expect(() => Browser.client.bewit('https://example.com/somewhere/over/the/rainbow', { credentials, ttlSec: 3000, ext: 'xandyandz' })).to.throw('Invalid credentials');
-            });
-
-            it('errors on invalid credentials (algorithm)', () => {
-
-                const credentials = {
-                    key: '2983d45yun89q',
-                    id: '123'
-                };
-
-                expect(() => Browser.client.bewit('https://example.com/somewhere/over/the/rainbow', { credentials, ttlSec: 3000, ext: 'xandyandz' })).to.throw('Invalid credentials');
-            });
-
-            it('errors on missing credentials', () => {
-
-                expect(() => Browser.client.bewit('https://example.com/somewhere/over/the/rainbow', { ttlSec: 3000, ext: 'xandyandz' })).to.throw('Invalid credentials');
-            });
-
-            it('errors on invalid credentials (key)', () => {
-
-                const credentials = {
-                    id: '123456',
-                    algorithm: 'sha256'
-                };
-
-                expect(() => Browser.client.bewit('https://example.com/somewhere/over/the/rainbow', { credentials, ttlSec: 3000, ext: 'xandyandz' })).to.throw('Invalid credentials');
-            });
-
-            it('errors on invalid algorithm', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: '2983d45yun89q',
-                    algorithm: 'hmac-sha-0'
-                };
-
-                expect(() => Browser.client.bewit('https://example.com/somewhere/over/the/rainbow', { credentials, ttlSec: 300, ext: 'xandyandz' })).to.throw('Unknown algorithm');
-            });
-
-            it('errors on missing options', () => {
-
-                expect(() => Browser.client.bewit('https://example.com/somewhere/over/the/rainbow')).to.throw('Invalid inputs');
-            });
-        });
-
-        describe('authenticate()', () => {
-
-            it('handles XMLHttpRequest request object', async () => {
-
-                const req = {
-                    method: 'POST',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        host: 'example.com:8080',
-                        'content-type': 'text/plain;x=y'
-                    }
-                };
-
-                const payload = 'some not so random text';
-
-                const credentials1 = credentialsFunc('123456');
-
-                const reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload, contentType: req.headers['content-type'] });
-                req.headers.authorization = reqHeader.header;
-
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(() => Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.not.throw();
-
-                const res = {
-                    _headers: {
-                        'content-type': 'text/plain'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res._headers[header.toLowerCase()];
-                    }
-                };
-
-                res._headers['server-authorization'] = Hawk.server.header(credentials2, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
-                expect(res._headers['server-authorization']).to.exist();
-
-                expect(Browser.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(true);
-            });
-
-            it('handles Browserify response object', async () => {
-
-                const req = {
-                    method: 'POST',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        host: 'example.com:8080',
-                        'content-type': 'text/plain;x=y'
-                    }
-                };
-
-                const payload = 'some not so random text';
-
-                const credentials1 = credentialsFunc('123456');
-
-                const reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload, contentType: req.headers['content-type'] });
-                req.headers.authorization = reqHeader.header;
-
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(() => Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.not.throw();
-
-                const res = {
-                    _headers: {
-                        'content-type': 'text/plain'
-                    },
-                    getHeader: function (header) {
-
-                        return res._headers[header.toLowerCase()];
-                    }
-                };
-
-                res._headers['server-authorization'] = Hawk.server.header(credentials2, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
-                expect(res._headers['server-authorization']).to.exist();
-
-                expect(Browser.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(true);
-            });
-
-            it('handles configuration response object', async () => {
-
-                const req = {
-                    method: 'POST',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        host: 'example.com:8080',
-                        'content-type': 'text/plain;x=y'
-                    }
-                };
-
-                const payload = 'some not so random text';
-
-                const credentials1 = credentialsFunc('123456');
-
-                const reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload, contentType: req.headers['content-type'] });
-                req.headers.authorization = reqHeader.header;
-
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(() => Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.not.throw();
-
-                const res = {
-                    headers: {
-                        'content-type': 'text/plain'
-                    }
-                };
-
-                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
-                expect(res.headers['server-authorization']).to.exist();
-
-                expect(Browser.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(true);
-            });
-
-            it('handles Fetch api response object', async () => {
-
-                const req = {
-                    method: 'POST',
-                    url: '/resource/4?filter=a',
-                    headers: {
-                        host: 'example.com:8080',
-                        'content-type': 'text/plain;x=y'
-                    }
-                };
-
-                const payload = 'some not so random text';
-
-                const credentials1 = credentialsFunc('123456');
-
-                const reqHeader = Browser.client.header('http://example.com:8080/resource/4?filter=a', req.method, { credentials: credentials1, ext: 'some-app-data', payload, contentType: req.headers['content-type'] });
-                req.headers.authorization = reqHeader.header;
-
-                const { credentials: credentials2, artifacts } = await Hawk.server.authenticate(req, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-                expect(artifacts.ext).to.equal('some-app-data');
-                expect(() => Hawk.server.authenticatePayload(payload, credentials2, artifacts, req.headers['content-type'])).to.not.throw();
-
-                const res = {
-                    headers: {
-                        get: (name) => res.headers[name.toLowerCase()],
-                        'content-type': 'text/plain'
-                    }
-                };
-
-                res.headers['server-authorization'] = Hawk.server.header(credentials2, artifacts, { payload: 'some reply', contentType: 'text/plain', ext: 'response-specific' });
-                expect(res.headers['server-authorization']).to.exist();
-
-                expect(Browser.client.authenticate(res, credentials2, artifacts, { payload: 'some reply' })).to.equal(true);
-            });
-
-            it('skips tsm validation when missing ts', () => {
-
-                const res = {
-                    headers: {
-                        'www-authenticate': 'Hawk error="Stale timestamp"'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                const credentials = {
-                    id: '123456',
-                    key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                    algorithm: 'sha256',
-                    user: 'steve'
-                };
-
-                const artifacts = {
-                    ts: 1402135580,
-                    nonce: 'iBRB6t',
-                    method: 'GET',
-                    resource: '/resource/4?filter=a',
-                    host: 'example.com',
-                    port: '8080',
-                    ext: 'some-app-data'
-                };
-
-                expect(Browser.client.authenticate(res, credentials, artifacts)).to.equal(true);
-            });
-
-            it('returns false on invalid header', () => {
-
-                const res = {
-                    headers: {
-                        'server-authorization': 'Hawk mac="abc", bad="xyz"'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                expect(Browser.client.authenticate(res, {})).to.equal(false);
-            });
-
-            it('returns false on invalid mac', () => {
-
-                const res = {
-                    headers: {
-                        'content-type': 'text/plain',
-                        'server-authorization': 'Hawk mac="_IJRsMl/4oL+nn+vKoeVZPdCHXB4yJkNnBbTbHFZUYE=", hash="f9cDF/TDm7TkYRLnGwRMfeDzT6LixQVLvrIKhh0vgmM=", ext="response-specific"'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                const artifacts = {
-                    method: 'POST',
-                    host: 'example.com',
-                    port: '8080',
-                    resource: '/resource/4?filter=a',
-                    ts: '1362336900',
-                    nonce: 'eb5S_L',
-                    hash: 'nJjkVtBE5Y/Bk38Aiokwn0jiJxt/0S2WRSUwWLCf5xk=',
-                    ext: 'some-app-data',
-                    app: undefined,
-                    dlg: undefined,
-                    mac: 'BlmSe8K+pbKIb6YsZCnt4E1GrYvY1AaYayNR82dGpIk=',
-                    id: '123456'
-                };
-
-                const credentials = {
-                    id: '123456',
-                    key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                    algorithm: 'sha256',
-                    user: 'steve'
-                };
-
-                expect(Browser.client.authenticate(res, credentials, artifacts)).to.equal(false);
-            });
-
-            it('returns true on ignoring hash', () => {
-
-                const res = {
-                    headers: {
-                        'content-type': 'text/plain',
-                        'server-authorization': 'Hawk mac="XIJRsMl/4oL+nn+vKoeVZPdCHXB4yJkNnBbTbHFZUYE=", hash="f9cDF/TDm7TkYRLnGwRMfeDzT6LixQVLvrIKhh0vgmM=", ext="response-specific"'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                const artifacts = {
-                    method: 'POST',
-                    host: 'example.com',
-                    port: '8080',
-                    resource: '/resource/4?filter=a',
-                    ts: '1362336900',
-                    nonce: 'eb5S_L',
-                    hash: 'nJjkVtBE5Y/Bk38Aiokwn0jiJxt/0S2WRSUwWLCf5xk=',
-                    ext: 'some-app-data',
-                    app: undefined,
-                    dlg: undefined,
-                    mac: 'BlmSe8K+pbKIb6YsZCnt4E1GrYvY1AaYayNR82dGpIk=',
-                    id: '123456'
-                };
-
-                const credentials = {
-                    id: '123456',
-                    key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                    algorithm: 'sha256',
-                    user: 'steve'
-                };
-
-                expect(Browser.client.authenticate(res, credentials, artifacts)).to.equal(true);
-            });
-
-            it('returns true on ignoring hash (null payload)', () => {
-
-                const res = {
-                    headers: {
-                        'content-type': 'text/plain',
-                        'server-authorization': 'Hawk mac="XIJRsMl/4oL+nn+vKoeVZPdCHXB4yJkNnBbTbHFZUYE=", hash="f9cDF/TDm7TkYRLnGwRMfeDzT6LixQVLvrIKhh0vgmM=", ext="response-specific"'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                const artifacts = {
-                    method: 'POST',
-                    host: 'example.com',
-                    port: '8080',
-                    resource: '/resource/4?filter=a',
-                    ts: '1362336900',
-                    nonce: 'eb5S_L',
-                    hash: 'nJjkVtBE5Y/Bk38Aiokwn0jiJxt/0S2WRSUwWLCf5xk=',
-                    ext: 'some-app-data',
-                    app: undefined,
-                    dlg: undefined,
-                    mac: 'BlmSe8K+pbKIb6YsZCnt4E1GrYvY1AaYayNR82dGpIk=',
-                    id: '123456'
-                };
-
-                const credentials = {
-                    id: '123456',
-                    key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                    algorithm: 'sha256',
-                    user: 'steve'
-                };
-
-                expect(Browser.client.authenticate(res, credentials, artifacts, { payload: null })).to.equal(true);
-            });
-
-            it('errors on invalid WWW-Authenticate header format', () => {
-
-                const res = {
-                    headers: {
-                        'www-authenticate': 'Hawk ts="1362346425875", tsm="PhwayS28vtnn3qbv0mqRBYSXebN/zggEtucfeZ620Zo=", x="Stale timestamp"'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                expect(Browser.client.authenticate(res, {})).to.equal(false);
-            });
-
-            it('errors on invalid WWW-Authenticate header format', () => {
-
-                const credentials = {
-                    id: '123456',
-                    key: 'werxhqb98rpaxn39848xrunpaw3489ruxnpa98w4rxn',
-                    algorithm: 'sha256',
-                    user: 'steve'
-                };
-
-                const res = {
-                    headers: {
-                        'www-authenticate': 'Hawk ts="1362346425875", tsm="hwayS28vtnn3qbv0mqRBYSXebN/zggEtucfeZ620Zo=", error="Stale timestamp"'
-                    },
-                    getResponseHeader: function (header) {
-
-                        return res.headers[header.toLowerCase()];
-                    }
-                };
-
-                expect(Browser.client.authenticate(res, credentials)).to.equal(false);
-            });
-        });
-
-        describe('message()', () => {
-
-            it('generates an authorization then successfully parse it', async () => {
-
-                const credentials1 = credentialsFunc('123456');
-
-                const auth = Browser.client.message('example.com', 8080, 'some message', { credentials: credentials1 });
-                expect(auth).to.exist();
-
-                const { credentials: credentials2 } = await Hawk.server.authenticateMessage('example.com', 8080, 'some message', auth, credentialsFunc);
-                expect(credentials2.user).to.equal('steve');
-            });
-
-            it('generates an authorization using custom nonce/timestamp', () => {
-
-                const credentials = credentialsFunc('123456');
-
-                const auth = Browser.client.message('example.com', 8080, 'some message', { credentials, nonce: 'abc123', timestamp: 1398536270957 });
-                expect(auth).to.exist();
-                expect(auth.nonce).to.equal('abc123');
-                expect(auth.ts).to.equal(1398536270957);
-            });
-
-            it('errors on missing host', () => {
-
-                const credentials = credentialsFunc('123456');
-                expect(() => Browser.client.message(null, 8080, 'some message', { credentials })).to.throw('Invalid inputs');
-            });
-
-            it('errors on invalid host', () => {
-
-                const credentials = credentialsFunc('123456');
-                expect(() => Browser.client.message(5, 8080, 'some message', { credentials })).to.throw('Invalid inputs');
-            });
-
-            it('errors on missing port', () => {
-
-                const credentials = credentialsFunc('123456');
-                expect(() => Browser.client.message('example.com', 0, 'some message', { credentials })).to.throw('Invalid inputs');
-            });
-
-            it('errors on invalid port', () => {
-
-                const credentials = credentialsFunc('123456');
-                expect(() => Browser.client.message('example.com', 'a', 'some message', { credentials })).to.throw('Invalid inputs');
-            });
-
-            it('errors on missing message', () => {
-
-                const credentials = credentialsFunc('123456');
-                expect(() => Browser.client.message('example.com', 8080, undefined, { credentials })).to.throw('Invalid inputs');
-            });
-
-            it('errors on null message', () => {
-
-                const credentials = credentialsFunc('123456');
-                expect(() => Browser.client.message('example.com', 8080, null, { credentials })).to.throw('Invalid inputs');
-            });
-
-            it('errors on invalid message', () => {
-
-                const credentials = credentialsFunc('123456');
-                expect(() => Browser.client.message('example.com', 8080, 5, { credentials })).to.throw('Invalid inputs');
-            });
-
-            it('errors on missing credentials', () => {
-
-                expect(() => Browser.client.message('example.com', 8080, 'some message', {})).to.throw('Invalid credentials');
-            });
-
-            it('errors on missing options', () => {
-
-                expect(() => Browser.client.message('example.com', 8080, 'some message')).to.throw('Invalid inputs');
-            });
-
-            it('errors on invalid options', () => {
-
-                expect(() => Browser.client.message('example.com', 8080, 'some message', 'abc')).to.throw('Invalid inputs');
-            });
-
-            it('errors on invalid credentials (id)', () => {
-
-                const credentials = credentialsFunc('123456');
-
-                const creds = Hoek.clone(credentials);
-                delete creds.id;
-                expect(() => Browser.client.message('example.com', 8080, 'some message', { credentials: creds })).to.throw('Invalid credentials');
-            });
-
-            it('errors on invalid credentials (key)', () => {
-
-                const credentials = credentialsFunc('123456');
-
-                const creds = Hoek.clone(credentials);
-                delete creds.key;
-                expect(() => Browser.client.message('example.com', 8080, 'some message', { credentials: creds })).to.throw('Invalid credentials');
-            });
-
-            it('errors on invalid credentials (algorithm)', () => {
-
-                const credentials = credentialsFunc('123456');
-
-                const creds = Hoek.clone(credentials);
-                delete creds.algorithm;
-                expect(() => Browser.client.message('example.com', 8080, 'some message', { credentials: creds })).to.throw('Invalid credentials');
-            });
-
-            it('errors on invalid algorithm', () => {
-
-                const credentials = credentialsFunc('123456');
-
-                const creds = Hoek.clone(credentials);
-                creds.algorithm = 'blah';
-                expect(() => Browser.client.message('example.com', 8080, 'some message', { credentials: creds })).to.throw('Unknown algorithm');
-            });
-        });
-
-        describe('authenticateTimestamp()', () => {
-
-            it('validates a timestamp', () => {
-
-                const credentials = credentialsFunc('123456');
-
-                const tsm = Hawk.crypto.timestampMessage(credentials);
-                expect(Browser.client.authenticateTimestamp(tsm, credentials)).to.equal(true);
-            });
-
-            it('validates a timestamp without updating local time', () => {
-
-                const credentials = credentialsFunc('123456');
-
-                const offset = Browser.utils.getNtpSecOffset();
-                const tsm = Hawk.crypto.timestampMessage(credentials, 10000);
-                expect(Browser.client.authenticateTimestamp(tsm, credentials, false)).to.equal(true);
-                expect(offset).to.equal(Browser.utils.getNtpSecOffset());
-            });
-
-            it('detects a bad timestamp', () => {
-
-                const credentials = credentialsFunc('123456');
-
-                const tsm = Hawk.crypto.timestampMessage(credentials);
-                tsm.ts = 4;
-                expect(Browser.client.authenticateTimestamp(tsm, credentials)).to.equal(false);
-            });
-        });
-    });
-
-    describe('internals', () => {
-
-        describe('LocalStorage', () => {
-
-            it('goes through the full lifecycle', () => {
-
-                const storage = new Browser.internals.LocalStorage();
-                expect(storage.length).to.equal(0);
-                expect(storage.getItem('a')).to.equal(null);
-                storage.setItem('a', 5);
-                expect(storage.length).to.equal(1);
-                expect(storage.key()).to.equal('a');
-                expect(storage.key(0)).to.equal('a');
-                expect(storage.getItem('a')).to.equal('5');
-                storage.setItem('b', 'test');
-                expect(storage.key()).to.equal('a');
-                expect(storage.key(0)).to.equal('a');
-                expect(storage.key(1)).to.equal('b');
-                expect(storage.length).to.equal(2);
-                expect(storage.getItem('b')).to.equal('test');
-                storage.removeItem('a');
-                expect(storage.length).to.equal(1);
-                expect(storage.getItem('a')).to.equal(null);
-                expect(storage.getItem('b')).to.equal('test');
-                storage.clear();
-                expect(storage.length).to.equal(0);
-                expect(storage.getItem('a')).to.equal(null);
-                expect(storage.getItem('b')).to.equal(null);
-            });
-        });
-    });
-
-    describe('utils', () => {
-
-        describe('setStorage()', () => {
-
-            it('sets storage for the first time', () => {
-
-                Browser.utils.storage = new Browser.internals.LocalStorage();        // Reset state
-
-                expect(Browser.utils.storage.getItem('hawk_ntp_offset')).to.not.exist();
-                Browser.utils.storage.setItem('test', '1');
-                Browser.utils.setStorage(new Browser.internals.LocalStorage());
-                expect(Browser.utils.storage.getItem('test')).to.not.exist();
-                Browser.utils.storage.setItem('test', '2');
-                expect(Browser.utils.storage.getItem('test')).to.equal('2');
-            });
-        });
-
-        describe('setNtpSecOffset()', () => {
-
-            it('catches localStorage errors', { parallel: false }, () => {
-
-                const orig = Browser.utils.storage.setItem;
-                const consoleOrig = console.error;
-                let count = 0;
-                console.error = function () {
-
-                    if (count++ === 2) {
-
-                        console.error = consoleOrig;
-                    }
-                };
-
-                Browser.utils.storage.setItem = function () {
-
-                    Browser.utils.storage.setItem = orig;
-                    throw new Error();
-                };
-
-                expect(() => {
-
-                    Browser.utils.setNtpSecOffset(100);
-                }).not.to.throw();
-            });
-        });
-
-        describe('parseAuthorizationHeader()', () => {
-
-            it('returns null on missing header', () => {
-
-                expect(Browser.utils.parseAuthorizationHeader()).to.equal(null);
-            });
-
-            it('returns null on bad header syntax (structure)', () => {
-
-                expect(Browser.utils.parseAuthorizationHeader('Hawk')).to.equal(null);
-            });
-
-            it('returns null on bad header syntax (parts)', () => {
-
-                expect(Browser.utils.parseAuthorizationHeader(' ')).to.equal(null);
-            });
-
-            it('returns null on bad scheme name', () => {
-
-                expect(Browser.utils.parseAuthorizationHeader('Basic asdasd')).to.equal(null);
-            });
-
-            it('returns null on bad attribute value', () => {
-
-                expect(Browser.utils.parseAuthorizationHeader('Hawk test="\t"', ['test'])).to.equal(null);
-            });
-
-            it('returns null on duplicated attribute', () => {
-
-                expect(Browser.utils.parseAuthorizationHeader('Hawk test="a", test="b"', ['test'])).to.equal(null);
-            });
-        });
-
-        describe('parseUri()', () => {
-
-            it('returns empty object on invalid', () => {
-
-                const uri = Browser.utils.parseUri('ftp');
-                expect(uri).to.equal({ host: '', port: '', resource: '' });
-            });
-
-            it('returns empty port when unknown scheme', () => {
-
-                const uri = Browser.utils.parseUri('ftp://example.com');
-                expect(uri.port).to.equal('');
-            });
-
-            it('returns default port when missing', () => {
-
-                const uri = Browser.utils.parseUri('http://example.com');
-                expect(uri.port).to.equal('80');
-            });
-
-            it('handles unusual characters correctly', () => {
-
-                const parts = {
-                    protocol: 'http+vnd.my-extension',
-                    user: 'user!$&\'()*+,;=%40my-domain.com',
-                    password: 'pass!$&\'()*+,;=%40:word',
-                    hostname: 'foo-bar.com',
-                    port: '99',
-                    pathname: '/path/%40/!$&\'()*+,;=:@/',
-                    query: 'query%40/!$&\'()*+,;=:@/?',
-                    fragment: 'fragm%40/!$&\'()*+,;=:@/?'
-                };
-
-                parts.userInfo = parts.user + ':' + parts.password;
-                parts.authority = parts.userInfo + '@' + parts.hostname + ':' + parts.port;
-                parts.relative = parts.pathname + '?' + parts.query;
-                parts.resource = parts.relative + '#' + parts.fragment;
-                parts.source = parts.protocol + '://' + parts.authority + parts.resource;
-
-                const uri = Browser.utils.parseUri(parts.source);
-                expect(uri.host).to.equal('foo-bar.com');
-                expect(uri.port).to.equal('99');
-                expect(uri.resource).to.equal(parts.pathname + '?' + parts.query);
-            });
-
-            it('handles email address in path', () => {
-
-                const uri = Browser.utils.parseUri('https://example.com/some/email@example.com');
-                expect(uri).to.equal({
-                    host: 'example.com',
-                    port: '443',
-                    resource: '/some/email@example.com'
-                });
-            });
-        });
-
-        describe('base64urlEncode()', () => {
-
-            it('should base64 URL-safe decode a string', () => {
-
-                const str = 'https://www.google.ca/webhp?sourceid=chrome-instant&ion=1&espv=2&ie=UTF-8#q=url';
-                const base64str = 'aHR0cHM6Ly93d3cuZ29vZ2xlLmNhL3dlYmhwP3NvdXJjZWlkPWNocm9tZS1pbnN0YW50Jmlvbj0xJmVzcHY9MiZpZT1VVEYtOCNxPXVybA';
-
-                expect(Browser.utils.base64urlEncode(str)).to.equal(base64str);
-            });
-        });
-    });
-
-    describe('crypto', () => {
-
-        describe('utils', () => {
-
-            it('exposes hash methods', () => {
-
-                expect(Browser.crypto.utils.SHA256('some message').toString(Browser.crypto.utils.enc.Base64)).to.equal('xHdXq+QCC5Fo0HdvbJFhf5KQ55CsL2zivWeHx0rYgZk=');
-            });
-        });
-    });
-});