Merge pull request #182 from snshn/version-bump

Version bump
version bump
2020-06-01 05:48:08 -04:00 · 2020-06-01 05:41:42 -04:00 · 2020-06-01 05:36:01 -04:00 · 2020-06-01 05:28:02 -04:00 · 2020-05-25 00:41:38 -04:00 · 2020-05-24 21:21:52 -04:00
43 changed files with 3501 additions and 2518 deletions
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -10,7 +10,7 @@ on:
 jobs:

  windows:
-    runs-on: windows-latest
+    runs-on: windows-2019
    steps:
    - run: git config --global core.autocrlf false
    - name: Checkout the repository
@@ -24,19 +24,30 @@ jobs:
        repo-token: ${{ secrets.GITHUB_TOKEN }}

  gnu_linux_armhf:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
    steps:
    - name: Checkout the repository
      uses: actions/checkout@v2
    - name: Prepare cross-platform environment
      run: |
+        sudo mkdir -p /cross-build-arm
+        sudo touch /etc/apt/sources.list.d/armhf.list
+        echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports/ bionic main" | sudo tee -a /etc/apt/sources.list.d/armhf.list
+        sudo apt-get update
+        sudo apt-get install -y gcc-arm-linux-gnueabihf libc6-armhf-cross libc6-dev-armhf-cross
+        sudo apt-get download libssl1.1:armhf libssl-dev:armhf
+        sudo dpkg -x libssl1.1*.deb /cross-build-arm
+        sudo dpkg -x libssl-dev*.deb /cross-build-arm
        rustup target add arm-unknown-linux-gnueabihf
-        git clone https://github.com/raspberrypi/tools.git rpi_tools
-    - name: Build and install the executable
-      run: |
-        export RUSTFLAGS="-C linker=rpi_tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc"
-        cargo build --release --target=arm-unknown-linux-gnueabihf
-    - uses: Shopify/upload-to-release@1.0.0
+        echo "::set-env name=C_INCLUDE_PATH::/cross-build-arm/usr/include"
+        echo "::set-env name=OPENSSL_INCLUDE_DIR::/cross-build-arm/usr/include/arm-linux-gnueabihf"
+        echo "::set-env name=OPENSSL_LIB_DIR::/cross-build-arm/usr/lib/arm-linux-gnueabihf"
+        echo "::set-env name=PKG_CONFIG_ALLOW_CROSS::1"
+        echo "::set-env name=RUSTFLAGS::-C linker=arm-linux-gnueabihf-gcc -L/usr/arm-linux-gnueabihf/lib -L/cross-build-arm/usr/lib/arm-linux-gnueabihf -L/cross-build-arm/lib/arm-linux-gnueabihf"
+    - name: Build the executable
+      run: cargo build --release --target=arm-unknown-linux-gnueabihf
+    - name: Attach artifact to the release
+      uses: Shopify/upload-to-release@1.0.0
      with:
        name: monolith-gnu-linux-armhf
        path: target/arm-unknown-linux-gnueabihf/release/monolith
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,4 +27,6 @@ jobs:
    - name: Run tests
      run: cargo test --all --locked --verbose
    - name: Check code formatting
-      run: cargo fmt --all -- --check
+      run: |
+        rustup component add rustfmt
+        cargo fmt --all -- --check
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -71,11 +71,40 @@ name = "bitflags"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "block-buffer"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "byte-tools"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "byteorder"
+version = "1.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bytes"
 version = "0.5.3"
@@ -173,6 +202,14 @@ name = "difference"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "digest"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "doc-comment"
 version = "0.3.1"
@@ -210,6 +247,11 @@ dependencies = [
 "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "fake-simd"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "flate2"
 version = "1.0.13"
@@ -308,6 +350,14 @@ dependencies = [
 "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "generic-array"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.1.13"
@@ -573,7 +623,7 @@ dependencies = [

 [[package]]
 name = "monolith"
-version = "2.2.3"
+version = "2.2.7"
 dependencies = [
 "assert_cmd 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -581,7 +631,9 @@ dependencies = [
 "cssparser 0.27.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "html5ever 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "reqwest 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
 "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -635,6 +687,11 @@ dependencies = [
 "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "opaque-debug"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "openssl"
 version = "0.10.26"
@@ -1101,6 +1158,17 @@ dependencies = [
 "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

+[[package]]
+name = "sha2"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "siphasher"
 version = "0.2.3"
@@ -1266,6 +1334,11 @@ name = "try-lock"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[[package]]
+name = "typenum"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicase"
 version = "2.6.0"
@@ -1508,7 +1581,11 @@ dependencies = [
 "checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
 "checksum base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
 "checksum bumpalo 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fe2567a8d8a3aedb4e39aa39e186d5673acfd56393c6ac83b2bc5bd82f4369c"
+"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
+"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 "checksum bytes 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10004c15deb332055f7a4a208190aed362cf9a7c2f6ab70a305fba50e1105f38"
 "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 "checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"
@@ -1521,11 +1598,13 @@ dependencies = [
 "checksum cssparser 0.27.2 (registry+https://github.com/rust-lang/crates.io-index)" = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a"
 "checksum cssparser-macros 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
 "checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
+"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
 "checksum doc-comment 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97"
 "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
 "checksum dtoa-short 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "59020b8513b76630c49d918c33db9f4c91638e7d3404a28084083b87e33f76f2"
 "checksum encoding_rs 0.8.20 (registry+https://github.com/rust-lang/crates.io-index)" = "87240518927716f79692c2ed85bfe6e98196d18c6401ec75355760233a7e12e9"
 "checksum escargot 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "74cf96bec282dcdb07099f7e31d9fed323bca9435a09aba7b6d99b7617bca96d"
+"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 "checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
@@ -1540,6 +1619,7 @@ dependencies = [
 "checksum futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd43c16"
 "checksum futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd669e5f9"
 "checksum futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76"
+"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
 "checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
 "checksum h2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9433d71e471c1736fd5a61b671fc0b148d7a2992f666c958d03cd8feb3b88d1"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
@@ -1573,6 +1653,7 @@ dependencies = [
 "checksum new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f40f005c60db6e03bae699e414c58bf9aa7ea02a2d0b9bfbcf19286cc4c82b30"
 "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
 "checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
+"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 "checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585"
 "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
 "checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f"
@@ -1625,6 +1706,7 @@ dependencies = [
 "checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0"
 "checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
 "checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
+"checksum sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0"
 "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 "checksum siphasher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e88f89a550c01e4cd809f3df4f52dc9e939f3273a2017eabd5c6d12fd98bb23"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
@@ -1645,6 +1727,7 @@ dependencies = [
 "checksum tower-service 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860"
 "checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
 "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
+"checksum typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
 "checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "monolith"
-version = "2.2.3"
+version = "2.2.7"
 edition = "2018"
 authors = [
    "Sunshine <sunshine@uberspace.net>",
@@ -16,6 +16,8 @@ base64 = "0.12.0"
 clap = "2.33.0"
 cssparser = "0.27.2"
 html5ever = "0.24.1"
+sha2 = "0.8.1" # Used in calculating checksums during integrity checks
+time = "0.1.42" # Used to render comments indicating the time the page was saved
 url = "2.1.1"

 [dependencies.reqwest]
--- a/README.md
+++ b/README.md
@@ -29,6 +29,9 @@ If compared to saving websites with `wget -mpk`, this tool embeds all assets as
    $ snap install monolith

 #### From source
+
+Dependency: `libssl-dev`
+
    $ git clone https://github.com/Y2Z/monolith.git
    $ cd monolith
    $ make install
@@ -46,14 +49,15 @@ The guide can be found [here](docs/containers.md)
 ## Options
 - `-c`: Ignore styles
 - `-f`: Exclude frames and iframes
+ - `-F`: Omit web fonts
 - `-i`: Remove images
 - `-I`: Isolate the document
 - `-j`: Exclude JavaScript
 - `-k`: Accept invalid X.509 (TLS) certificates
 - `-o`: Write output to file
- - `-s`: Silent mode
- - `-t`: Set custom network request timeout
- - `-u`: Provide own User-Agent
+ - `-s`: Enable silent mode
+ - `-t`: Adjust network request timeout
+ - `-u`: Provide custom User-Agent

 ---------------------------------------------------

--- a/docs/arch/0002-noscript-nodes.md
+++ b/docs/arch/0002-noscript-nodes.md
@@ -0,0 +1,19 @@
+# 2. NOSCRIPT nodes
+
+Date: 2020-04-16
+
+## Status
+
+Accepted
+
+## Context
+
+HTML pages can contain `noscript` nodes, which reveal their contents only in case when JavaScript is not available. Most of the time they contain hidden messages that inform about certain JavaScript-dependent features not being operational, however sometimes can also feature media assets or even iframes.
+
+## Decision
+
+When the document is being saved with or without JavaScript, each `noscript` node should be preserved while its children need to be processed exactly the same way as the rest of the document. This approach will ensure that even hidden remote assets are embedded — since those hidden elements may have to be displayed later in a browser that has JavaScript turned off. An option should be available to "unwrap" all `noscript` nodes in order to make their contents always visible in the document, complimenting the "disable JS" function of the program.
+
+## Consequences
+
+Saved documents will have contents of all `noscript` nodes processed as if they are part of the document's DOM, therefore properly display images encapsulated within `noscript` nodes when being viewed in browsers that have JavaScript turned off (or have no JavaScript support in the first place). The new option to "unwrap" `noscript` elements will help the user ensure that the resulting document always represents what the original web page looked like in a browser that had JavaScript turned off.
--- a/docs/arch/0003-network-request-timeout.md
+++ b/docs/arch/0003-network-request-timeout.md
@@ -12,14 +12,10 @@ A slow network connection and overloaded server may negatively impact network re

 ## Decision

-Make the program simulate behavior of popular web browsers and CLI tools, where 
-the default network response timeout is most often set to 120 seconds.
+Make the program simulate behavior of popular web browsers and CLI tools, where the default network response timeout is most often set to 120 seconds.

-Instead of featuring retries for timed out network requests, the program
-should have an option to adjust the timeout length, along with making it
-indefinite when given "0" as its value.
+Instead of featuring retries for timed out network requests, the program should have an option to adjust the timeout length, along with making it indefinite when given "0" as its value.

 ## Consequences

-The user is able to retrieve resources that have long response time, as well as obtain
-full control over how soon, and if at all, network requests should time out.
+The user is able to retrieve resources that have long response time, as well as obtain full control over how soon, and if at all, network requests should time out.
--- a/docs/arch/0004-asset-integrity-check.md
+++ b/docs/arch/0004-asset-integrity-check.md
@@ -0,0 +1,21 @@
+# 4. Asset integrity check
+
+Date: 2020-02-23
+
+## Status
+
+Accepted
+
+## Context
+
+In HTML5, `link` and `script` nodes have an attribute named `integrity`, which lets the browser check if the remote file is valid, mostly for the purpose of enhancing page security.
+
+## Decision
+
+In order to replicate the browser's behavior, the program should perform integrity check the same way it does, excluding the linked asset from the final result if such check fails.
+
+The `integrity` attribute should be removed from nodes, as it bears no benefit for resources embedded as data URLs.
+
+## Consequences
+
+Assets that fail to pass the check get excluded from the saved document. Meanwhile, saved documents no longer contain integrity attributes on all `link` and `script` nodes.
--- a/docs/arch/0005-asset-minimization.md
+++ b/docs/arch/0005-asset-minimization.md
@@ -8,18 +8,12 @@ Accepted

 ## Context

-It may look like a good idea to make monolith compress retrieved assets while
-saving the page for the purpose of reducing the resulting document's file size.
+It may look like a good idea to make monolith compress retrieved assets while saving the page for the purpose of reducing the resulting document's file size.

 ## Decision

-Given that the main purpose of this program is to save pages in a convenient to store and share manner — it's mostly an archiving tool,
-aside from being able to tell monolith to exclude certain types of asests (e.g. images, CSS, JavaScript),
-it would be outside of scope of this program to implement code for compressing assets. Minimizing files before embedding them
-does not reduce the amount of data that needs to be transferred either. A separate tool can be used later to compress and minimize pages
-saved by monolith, if needed.
+Given that the main purpose of this program is to save pages in a convenient to store and share manner — it's mostly an archiving tool, aside from being able to tell monolith to exclude certain types of asests (e.g. images, CSS, JavaScript), it would be outside of scope of this program to implement code for compressing assets. Minimizing files before embedding them does not reduce the amount of data that needs to be transferred either. A separate tool can be used later to compress and minimize pages saved by monolith, if needed.

 ## Consequences

-Monolith will not support modification of original document assets for the purpose of reducing their size, sticking to performing only a minimal
-amount of modifications to the original web page — whatever is needed to provide security or exclude unwanted asset types.
+Monolith will not support modification of original document assets for the purpose of reducing their size, sticking to performing only minimal amount of modifications to the original web page — whatever is needed to provide security or exclude unwanted asset types.
--- a/src/args.rs
+++ b/src/args.rs
@@ -4,6 +4,7 @@ use clap::{App, Arg};
 pub struct AppArgs {
    pub target: String,
    pub no_css: bool,
+    pub no_fonts: bool,
    pub no_frames: bool,
    pub no_images: bool,
    pub no_js: bool,
@@ -13,6 +14,7 @@ pub struct AppArgs {
    pub silent: bool,
    pub timeout: u64,
    pub user_agent: String,
+    pub no_metadata: bool,
 }

 const DEFAULT_NETWORK_TIMEOUT: u64 = 120;
@@ -35,10 +37,12 @@ impl AppArgs {
            // .args_from_usage("-a, --include-audio 'Removes audio sources'")
            .args_from_usage("-c, --no-css 'Removes CSS'")
            .args_from_usage("-f, --no-frames 'Removes frames and iframes'")
+            .args_from_usage("-F, --no-fonts 'Removes fonts'")
            .args_from_usage("-i, --no-images 'Removes images'")
            .args_from_usage("-I, --isolate 'Cuts off document from the Internet'")
            .args_from_usage("-j, --no-js 'Removes JavaScript'")
            .args_from_usage("-k, --insecure 'Allows invalid X.509 (TLS) certificates'")
+            .args_from_usage("-M, --no-metadata 'Excludes metadata information from the document'")
            .args_from_usage("-o, --output=[document.html] 'Writes output to <file>'")
            .args_from_usage("-s, --silent 'Suppresses verbosity'")
            .args_from_usage("-t, --timeout=[60] 'Adjusts network request timeout'")
@@ -52,10 +56,12 @@ impl AppArgs {
            .expect("please set target")
            .to_string();
        app_args.no_css = app.is_present("no-css");
+        app_args.no_fonts = app.is_present("no-fonts");
        app_args.no_frames = app.is_present("no-frames");
        app_args.no_images = app.is_present("no-images");
        app_args.no_js = app.is_present("no-js");
        app_args.insecure = app.is_present("insecure");
+        app_args.no_metadata = app.is_present("no-metadata");
        app_args.isolate = app.is_present("isolate");
        app_args.silent = app.is_present("silent");
        app_args.timeout = app
--- a/src/css.rs
+++ b/src/css.rs
@@ -2,12 +2,12 @@ use cssparser::{ParseError, Parser, ParserInput, SourcePosition, Token};
 use reqwest::blocking::Client;
 use std::collections::HashMap;

-use crate::utils::{data_to_data_url, decode_url, get_url_fragment, resolve_url, retrieve_asset};
+use crate::utils::{data_to_data_url, get_url_fragment, is_http_url, resolve_url, retrieve_asset};

 const CSS_PROPS_WITH_IMAGE_URLS: &[&str] = &[
+    // Universal
    "background",
    "background-image",
-    "border",
    "border-image",
    "border-image-source",
    "content",
@@ -16,7 +16,15 @@ const CSS_PROPS_WITH_IMAGE_URLS: &[&str] = &[
    "list-style-image",
    "mask",
    "mask-image",
+    // Specific to @counter-style
+    "additive-symbols",
+    "negative",
+    "pad",
+    "prefix",
+    "suffix",
+    "symbols",
 ];
+const CSS_SPECIAL_CHARS: &str = "~!@$%^&*()+=,./'\";:?><[]{}|`#";

 pub fn is_image_url_prop(prop_name: &str) -> bool {
    CSS_PROPS_WITH_IMAGE_URLS
@@ -33,14 +41,27 @@ pub fn enquote(input: String, double: bool) -> String {
    }
 }

+pub fn escape(value: &str) -> String {
+    let mut res = str!(&value);
+
+    res = res.replace("\\", "\\\\");
+
+    for c in CSS_SPECIAL_CHARS.chars() {
+        res = res.replace(c, format!("\\{}", c).as_str());
+    }
+
+    res
+}
+
 pub fn process_css<'a>(
-    cache: &mut HashMap<String, String>,
+    cache: &mut HashMap<String, Vec<u8>>,
    client: &Client,
    parent_url: &str,
    parser: &mut Parser,
    rule_name: &str,
    prop_name: &str,
    func_name: &str,
+    opt_no_fonts: bool,
    opt_no_images: bool,
    opt_silent: bool,
 ) -> Result<String, ParseError<'a, String>> {
@@ -69,6 +90,10 @@ pub fn process_css<'a>(
            Token::Colon => result.push_str(":"),
            Token::Comma => result.push_str(","),
            Token::ParenthesisBlock | Token::SquareBracketBlock | Token::CurlyBracketBlock => {
+                if opt_no_fonts && curr_rule == "font-face" {
+                    continue;
+                }
+
                let closure: &str;
                if token == &Token::ParenthesisBlock {
                    result.push_str("(");
@@ -91,6 +116,7 @@ pub fn process_css<'a>(
                            rule_name,
                            curr_prop.as_str(),
                            func_name,
+                            opt_no_fonts,
                            opt_no_images,
                            opt_silent,
                        )
@@ -113,12 +139,18 @@ pub fn process_css<'a>(
            Token::WhiteSpace(ref value) => {
                result.push_str(value);
            }
+            // div...
            Token::Ident(ref value) => {
+                curr_rule = str!();
                curr_prop = str!(value);
-                result.push_str(value);
+                result.push_str(&escape(value));
            }
+            // @import, @font-face, @charset, @media...
            Token::AtKeyword(ref value) => {
                curr_rule = str!(value);
+                if opt_no_fonts && curr_rule == "font-face" {
+                    continue;
+                }
                result.push_str("@");
                result.push_str(value);
            }
@@ -127,53 +159,49 @@ pub fn process_css<'a>(
                result.push_str(value);
            }
            Token::QuotedString(ref value) => {
-                let is_import: bool = curr_rule == "import";
-                if is_import {
+                if curr_rule == "import" {
                    // Reset current at-rule value
                    curr_rule = str!();
-                }

-                if is_import {
                    // Skip empty import values
                    if value.len() < 1 {
                        result.push_str("''");
                        continue;
                    }

-                    let full_url = resolve_url(&parent_url, value).unwrap_or_default();
-                    let url_fragment = get_url_fragment(full_url.clone());
-                    let full_url_decoded = decode_url(full_url);
-                    let (css, final_url) = retrieve_asset(
-                        cache,
-                        client,
-                        &parent_url,
-                        &full_url_decoded,
-                        false,
-                        "",
-                        opt_silent,
-                    )
-                    .unwrap_or_default();
-
-                    result.push_str(
-                        enquote(
-                            data_to_data_url(
-                                "text/css",
-                                embed_css(
-                                    cache,
-                                    client,
-                                    final_url.as_str(),
-                                    &css,
-                                    opt_no_images,
-                                    opt_silent,
+                    let import_full_url = resolve_url(&parent_url, value).unwrap_or_default();
+                    let import_url_fragment = get_url_fragment(import_full_url.clone());
+                    match retrieve_asset(cache, client, &parent_url, &import_full_url, opt_silent) {
+                        Ok((import_contents, import_final_url, _import_media_type)) => {
+                            result.push_str(
+                                enquote(
+                                    data_to_data_url(
+                                        "text/css",
+                                        embed_css(
+                                            cache,
+                                            client,
+                                            &import_final_url,
+                                            &String::from_utf8_lossy(&import_contents),
+                                            opt_no_fonts,
+                                            opt_no_images,
+                                            opt_silent,
+                                        )
+                                        .as_bytes(),
+                                        &import_final_url,
+                                        &import_url_fragment,
+                                    ),
+                                    false,
                                )
-                                .as_bytes(),
-                                &final_url,
-                                url_fragment.as_str(),
-                            ),
-                            false,
-                        )
-                        .as_str(),
-                    );
+                                .as_str(),
+                            );
+                        }
+                        Err(_) => {
+                            // Keep remote reference if unable to retrieve the asset
+                            if is_http_url(import_full_url.clone()) {
+                                result.push_str(enquote(import_full_url, false).as_str());
+                            }
+                        }
+                    }
                } else {
                    if func_name == "url" {
                        // Skip empty url()'s
@@ -185,17 +213,30 @@ pub fn process_css<'a>(
                            result.push_str(enquote(str!(empty_image!()), false).as_str());
                        } else {
                            let resolved_url = resolve_url(&parent_url, value).unwrap_or_default();
-                            let (data_url, _final_url) = retrieve_asset(
+                            let url_fragment = get_url_fragment(resolved_url.clone());
+                            match retrieve_asset(
                                cache,
                                client,
                                &parent_url,
                                &resolved_url,
-                                true,
-                                "",
                                opt_silent,
-                            )
-                            .unwrap_or_default();
-                            result.push_str(enquote(data_url, false).as_str());
+                            ) {
+                                Ok((data, final_url, media_type)) => {
+                                    let data_url = data_to_data_url(
+                                        &media_type,
+                                        &data,
+                                        &final_url,
+                                        &url_fragment,
+                                    );
+                                    result.push_str(enquote(data_url, false).as_str());
+                                }
+                                Err(_) => {
+                                    // Keep remote reference if unable to retrieve the asset
+                                    if is_http_url(resolved_url.clone()) {
+                                        result.push_str(enquote(resolved_url, false).as_str());
+                                    }
+                                }
+                            }
                        }
                    } else {
                        result.push_str(enquote(str!(value), false).as_str());
@@ -235,12 +276,15 @@ pub fn process_css<'a>(
                result.push_str(str!(value).as_str());
                result.push_str(str!(unit).as_str());
            }
+            // #selector, #id...
            Token::IDHash(ref value) => {
+                curr_rule = str!();
                result.push_str("#");
-                result.push_str(value);
+                result.push_str(&escape(value));
            }
            Token::UnquotedUrl(ref value) => {
                let is_import: bool = curr_rule == "import";
+
                if is_import {
                    // Reset current at-rule value
                    curr_rule = str!();
@@ -261,54 +305,51 @@ pub fn process_css<'a>(
                if is_import {
                    let full_url = resolve_url(&parent_url, value).unwrap_or_default();
                    let url_fragment = get_url_fragment(full_url.clone());
-                    let full_url_decoded = decode_url(full_url);
-                    let (css, final_url) = retrieve_asset(
-                        cache,
-                        client,
-                        &parent_url,
-                        &full_url_decoded,
-                        false,
-                        "",
-                        opt_silent,
-                    )
-                    .unwrap_or_default();
-
-                    result.push_str(
-                        enquote(
-                            data_to_data_url(
+                    match retrieve_asset(cache, client, &parent_url, &full_url, opt_silent) {
+                        Ok((css, final_url, _media_type)) => {
+                            let data_url = data_to_data_url(
                                "text/css",
                                embed_css(
                                    cache,
                                    client,
-                                    final_url.as_str(),
-                                    &css,
+                                    &final_url,
+                                    &String::from_utf8_lossy(&css),
+                                    opt_no_fonts,
                                    opt_no_images,
                                    opt_silent,
                                )
                                .as_bytes(),
                                &final_url,
-                                url_fragment.as_str(),
-                            ),
-                            false,
-                        )
-                        .as_str(),
-                    );
+                                &url_fragment,
+                            );
+                            result.push_str(enquote(data_url, false).as_str());
+                        }
+                        Err(_) => {
+                            // Keep remote reference if unable to retrieve the asset
+                            if is_http_url(full_url.clone()) {
+                                result.push_str(enquote(full_url, false).as_str());
+                            }
+                        }
+                    }
                } else {
                    if opt_no_images && is_image_url_prop(curr_prop.as_str()) {
                        result.push_str(enquote(str!(empty_image!()), false).as_str());
                    } else {
                        let full_url = resolve_url(&parent_url, value).unwrap_or_default();
-                        let (data_url, _final_url) = retrieve_asset(
-                            cache,
-                            client,
-                            &parent_url,
-                            &full_url,
-                            true,
-                            "",
-                            opt_silent,
-                        )
-                        .unwrap_or_default();
-                        result.push_str(enquote(data_url, false).as_str());
+                        let url_fragment = get_url_fragment(full_url.clone());
+                        match retrieve_asset(cache, client, &parent_url, &full_url, opt_silent) {
+                            Ok((data, final_url, media_type)) => {
+                                let data_url =
+                                    data_to_data_url(&media_type, &data, &final_url, &url_fragment);
+                                result.push_str(enquote(data_url, false).as_str());
+                            }
+                            Err(_) => {
+                                // Keep remote reference if unable to retrieve the asset
+                                if is_http_url(full_url.clone()) {
+                                    result.push_str(enquote(full_url, false).as_str());
+                                }
+                            }
+                        }
                    }
                }
                result.push_str(")");
@@ -329,6 +370,7 @@ pub fn process_css<'a>(
                            curr_rule.as_str(),
                            curr_prop.as_str(),
                            function_name,
+                            opt_no_fonts,
                            opt_no_images,
                            opt_silent,
                        )
@@ -346,10 +388,11 @@ pub fn process_css<'a>(
 }

 pub fn embed_css(
-    cache: &mut HashMap<String, String>,
+    cache: &mut HashMap<String, Vec<u8>>,
    client: &Client,
    parent_url: &str,
    css: &str,
+    opt_no_fonts: bool,
    opt_no_images: bool,
    opt_silent: bool,
 ) -> String {
@@ -364,6 +407,7 @@ pub fn embed_css(
        "",
        "",
        "",
+        opt_no_fonts,
        opt_no_images,
        opt_silent,
    )
--- a/src/html.rs
+++ b/src/html.rs
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,8 @@
 use monolith::html::{html_to_dom, stringify_document, walk_and_embed_assets};
-use monolith::utils::{data_url_to_text, is_data_url, is_file_url, is_http_url, retrieve_asset};
+use monolith::utils::{data_url_to_data, is_data_url, is_file_url, is_http_url, retrieve_asset};
 use reqwest::blocking::Client;
 use reqwest::header::{HeaderMap, HeaderValue, USER_AGENT};
+use reqwest::Url;
 use std::collections::HashMap;
 use std::env;
 use std::fs;
@@ -109,43 +110,44 @@ fn main() {

    // Retrieve root document
    if is_file_url(target_url) || is_http_url(target_url) {
-        let (data, final_url) = retrieve_asset(
-            &mut cache,
-            &client,
-            target_url,
-            target_url,
-            false,
-            "",
-            app_args.silent,
-        )
-        .expect("Could not retrieve target document");
-        base_url = final_url;
-        dom = html_to_dom(&data);
+        match retrieve_asset(&mut cache, &client, target_url, target_url, app_args.silent) {
+            Ok((data, final_url, _media_type)) => {
+                base_url = final_url;
+                dom = html_to_dom(&String::from_utf8_lossy(&data));
+            }
+            Err(_) => {
+                eprintln!("Could not retrieve target document");
+                process::exit(1);
+            }
+        }
    } else if is_data_url(target_url) {
-        let text: String = data_url_to_text(target_url);
-        if text.len() == 0 {
-            eprintln!("Unsupported data URL input");
+        let (media_type, data): (String, Vec<u8>) = data_url_to_data(target_url);
+        if !media_type.eq_ignore_ascii_case("text/html") {
+            eprintln!("Unsupported data URL media type");
            process::exit(1);
        }
        base_url = str!(target_url);
-        dom = html_to_dom(&text);
+        dom = html_to_dom(&String::from_utf8_lossy(&data));
    } else {
        process::exit(1);
    }

+    let time_saved = time::now_utc();
+
    walk_and_embed_assets(
        &mut cache,
        &client,
        &base_url,
        &dom.document,
        app_args.no_css,
+        app_args.no_fonts,
+        app_args.no_frames,
        app_args.no_js,
        app_args.no_images,
        app_args.silent,
-        app_args.no_frames,
    );

-    let html: String = stringify_document(
+    let mut html: String = stringify_document(
        &dom.document,
        app_args.no_css,
        app_args.no_frames,
@@ -154,6 +156,35 @@ fn main() {
        app_args.isolate,
    );

+    if !app_args.no_metadata {
+        // Safe to unwrap (we just put this through an HTTP request)
+        let mut clean_url = Url::parse(&base_url).unwrap();
+        clean_url.set_fragment(None);
+        // Prevent credentials from getting into metadata
+        if is_http_url(&base_url) {
+            // Only HTTP(S) URLs may feature credentials
+            clean_url.set_username("").unwrap();
+            clean_url.set_password(None).unwrap();
+        }
+        let metadata_comment = if is_http_url(&base_url) {
+            format!(
+                "<!-- Saved from {} at {} using {} v{} -->\n",
+                &clean_url,
+                time_saved.rfc3339(),
+                env!("CARGO_PKG_NAME"),
+                env!("CARGO_PKG_VERSION"),
+            )
+        } else {
+            format!(
+                "<!-- Saved from local source at {} using {} v{} -->\n",
+                time_saved.rfc3339(),
+                env!("CARGO_PKG_NAME"),
+                env!("CARGO_PKG_VERSION"),
+            )
+        };
+        html.insert_str(0, &metadata_comment);
+    }
+
    output
        .writeln_str(&html)
        .expect("Could not write HTML output");
--- a/src/tests/cli.rs
+++ b/src/tests/cli.rs
@@ -1,9 +1,3 @@
-use assert_cmd::prelude::*;
-use std::env;
-use std::io::Write;
-use std::process::Command;
-use tempfile::NamedTempFile;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -11,510 +5,527 @@ use tempfile::NamedTempFile;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_print_version() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let out = cmd.arg("-V").output().unwrap();
+#[cfg(test)]
+mod passing {
+    use assert_cmd::prelude::*;
+    use std::env;
+    use std::io::Write;
+    use std::process::Command;
+    use tempfile::NamedTempFile;

-    // STDOUT should contain program name and version
-    assert_eq!(
-        std::str::from_utf8(&out.stdout).unwrap(),
-        format!("{} {}\n", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"))
-    );
+    #[test]
+    fn print_version() -> Result<(), Box<dyn std::error::Error>> {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let out = cmd.arg("-V").output().unwrap();

-    // STDERR should be empty
-    assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+        // STDOUT should contain program name and version
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            format!("{} {}\n", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"))
+        );

-    // The exit code should be 0
-    out.assert().code(0);
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");

-    Ok(())
-}
+        // The exit code should be 0
+        out.assert().code(0);

-#[test]
-fn passing_bad_input_empty_target() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let out = cmd.arg("").output().unwrap();
+        Ok(())
+    }

-    // STDOUT should be empty
-    assert_eq!(std::str::from_utf8(&out.stdout).unwrap(), "");
+    #[test]
+    fn bad_input_empty_target() -> Result<(), Box<dyn std::error::Error>> {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let out = cmd.arg("").output().unwrap();

-    // STDERR should contain error description
-    assert_eq!(
-        std::str::from_utf8(&out.stderr).unwrap(),
-        "No target specified\n"
-    );
+        // STDOUT should be empty
+        assert_eq!(std::str::from_utf8(&out.stdout).unwrap(), "");

-    // The exit code should be 1
-    out.assert().code(1);
+        // STDERR should contain error description
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            "No target specified\n"
+        );

-    Ok(())
-}
+        // The exit code should be 1
+        out.assert().code(1);

-#[test]
-fn passing_bad_input_data_url() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let out = cmd.arg("data:,Hello%2C%20World!").output().unwrap();
+        Ok(())
+    }

-    // STDOUT should contain HTML
-    assert_eq!(std::str::from_utf8(&out.stdout).unwrap(), "");
+    #[test]
+    fn bad_input_data_url() -> Result<(), Box<dyn std::error::Error>> {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let out = cmd.arg("data:,Hello%2C%20World!").output().unwrap();

-    // STDERR should contain error description
-    assert_eq!(
-        std::str::from_utf8(&out.stderr).unwrap(),
-        "Unsupported data URL input\n"
-    );
+        // STDOUT should contain HTML
+        assert_eq!(std::str::from_utf8(&out.stdout).unwrap(), "");

-    // The exit code should be 1
-    out.assert().code(1);
+        // STDERR should contain error description
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            "Unsupported data URL media type\n"
+        );

-    Ok(())
-}
+        // The exit code should be 1
+        out.assert().code(1);

-#[test]
-fn passing_isolate_data_url() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let out = cmd
-        .arg("-I")
-        .arg("data:text/html,Hello%2C%20World!")
-        .output()
-        .unwrap();
+        Ok(())
+    }

-    // STDOUT should contain isolated HTML
-    assert_eq!(
-        std::str::from_utf8(&out.stdout).unwrap(),
-        "<html><head>\
-<meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:;\"></meta>\
-</head><body>Hello, World!</body></html>\n"
-    );
+    #[test]
+    fn isolate_data_url() -> Result<(), Box<dyn std::error::Error>> {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let out = cmd
+            .arg("-M")
+            .arg("-I")
+            .arg("data:text/html,Hello%2C%20World!")
+            .output()
+            .unwrap();

-    // STDERR should be empty
-    assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+        // STDOUT should contain isolated HTML
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head>\
+            <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:;\"></meta>\
+            </head><body>Hello, World!</body></html>\n"
+        );

-    // The exit code should be 0
-    out.assert().code(0);
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");

-    Ok(())
-}
+        // The exit code should be 0
+        out.assert().code(0);

-#[test]
-fn passing_remove_css_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let out = cmd
-        .arg("-c")
-        .arg("data:text/html,<style>body{background-color:pink}</style>Hello")
-        .output()
-        .unwrap();
+        Ok(())
+    }

-    // STDOUT should contain HTML with no CSS
-    assert_eq!(
-        std::str::from_utf8(&out.stdout).unwrap(),
-        "<html><head>\
-<meta http-equiv=\"Content-Security-Policy\" content=\"style-src 'none';\"></meta>\
-<style></style>\
-</head><body>Hello</body></html>\n"
-    );
+    #[test]
+    fn remove_css_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let out = cmd
+            .arg("-M")
+            .arg("-c")
+            .arg("data:text/html,<style>body{background-color:pink}</style>Hello")
+            .output()
+            .unwrap();

-    // STDERR should be empty
-    assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+        // STDOUT should contain HTML with no CSS
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head>\
+            <meta http-equiv=\"Content-Security-Policy\" content=\"style-src 'none';\"></meta>\
+            <style></style>\
+            </head><body>Hello</body></html>\n"
+        );

-    // The exit code should be 0
-    out.assert().code(0);
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");

-    Ok(())
-}
+        // The exit code should be 0
+        out.assert().code(0);

-#[test]
-fn passing_remove_frames_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let out = cmd
-        .arg("-f")
-        .arg("data:text/html,<iframe src=\"https://google.com\"></iframe>Hi")
-        .output()
-        .unwrap();
+        Ok(())
+    }

-    // STDOUT should contain HTML with no iframes
-    assert_eq!(
-        std::str::from_utf8(&out.stdout).unwrap(),
-        "<html><head>\
-<meta http-equiv=\"Content-Security-Policy\" content=\"frame-src 'none';child-src 'none';\"></meta>\
-</head><body><iframe src=\"\"></iframe>Hi</body></html>\n"
-    );
+    #[test]
+    fn remove_frames_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let out = cmd
+            .arg("-M")
+            .arg("-f")
+            .arg("data:text/html,<iframe src=\"https://google.com\"></iframe>Hi")
+            .output()
+            .unwrap();

-    // STDERR should be empty
-    assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+        // STDOUT should contain HTML with no iframes
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head>\
+            <meta http-equiv=\"Content-Security-Policy\" content=\"frame-src 'none';child-src 'none';\"></meta>\
+            </head><body><iframe src=\"\"></iframe>Hi</body></html>\n"
+        );

-    // The exit code should be 0
-    out.assert().code(0);
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");

-    Ok(())
-}
+        // The exit code should be 0
+        out.assert().code(0);

-#[test]
-fn passing_remove_images_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let out = cmd
-        .arg("-i")
-        .arg("data:text/html,<img src=\"https://google.com\"/>Hi")
-        .output()
-        .unwrap();
+        Ok(())
+    }

-    // STDOUT should contain HTML with no images
-    assert_eq!(
-        std::str::from_utf8(&out.stdout).unwrap(),
-        format!(
+    #[test]
+    fn remove_images_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let out = cmd
+            .arg("-M")
+            .arg("-i")
+            .arg("data:text/html,<img src=\"https://google.com\"/>Hi")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain HTML with no images
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            format!(
+                "<html>\
+                <head>\
+                <meta http-equiv=\"Content-Security-Policy\" content=\"img-src data:;\"></meta>\
+                </head>\
+                <body>\
+                <img src=\"{empty_image}\">\
+                Hi\
+                </body>\
+                </html>\n",
+                empty_image = empty_image!()
+            )
+        );
+
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+
+        // The exit code should be 0
+        out.assert().code(0);
+
+        Ok(())
+    }
+
+    #[test]
+    fn remove_js_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let out = cmd
+            .arg("-M")
+            .arg("-j")
+            .arg("data:text/html,<script>alert(2)</script>Hi")
+            .output()
+            .unwrap();
+
+        // STDOUT should contain HTML with no JS
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
            "<html>\
-<head>\
-<meta http-equiv=\"Content-Security-Policy\" content=\"img-src data:;\"></meta>\
-</head>\
-<body>\
-<img src=\"{empty_image}\">\
-Hi\
-</body>\
-</html>\n",
-            empty_image = empty_image!()
-        )
-    );
+            <head>\
+            <meta http-equiv=\"Content-Security-Policy\" content=\"script-src 'none';\"></meta>\
+            <script></script></head>\
+            <body>Hi</body>\
+            </html>\n"
+        );

-    // STDERR should be empty
-    assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");

-    // The exit code should be 0
-    out.assert().code(0);
+        // The exit code should be 0
+        out.assert().code(0);

-    Ok(())
-}
+        Ok(())
+    }

-#[test]
-fn passing_remove_js_from_data_url() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let out = cmd
-        .arg("-j")
-        .arg("data:text/html,<script>alert(2)</script>Hi")
-        .output()
-        .unwrap();
+    #[test]
+    fn local_file_target_input() -> Result<(), Box<dyn std::error::Error>> {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let cwd_normalized: String =
+            str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
+        let out = cmd
+            .arg("-M")
+            .arg(if cfg!(windows) {
+                "src\\tests\\data\\basic\\local-file.html"
+            } else {
+                "src/tests/data/basic/local-file.html"
+            })
+            .output()
+            .unwrap();
+        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };

-    // STDOUT should contain HTML with no JS
-    assert_eq!(
-        std::str::from_utf8(&out.stdout).unwrap(),
-        "<html>\
-<head>\
-<meta http-equiv=\"Content-Security-Policy\" content=\"script-src 'none';\"></meta>\
-<script></script></head>\
-<body>Hi</body>\
-</html>\n"
-    );
-
-    // STDERR should be empty
-    assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
-
-    // The exit code should be 0
-    out.assert().code(0);
-
-    Ok(())
-}
-
-#[test]
-fn passing_local_file_target_input() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let cwd_normalized: String =
-        str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
-    let out = cmd
-        .arg(if cfg!(windows) {
-            "src\\tests\\data\\local-file.html"
-        } else {
-            "src/tests/data/local-file.html"
-        })
-        .output()
-        .unwrap();
-    let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
-
-    // STDOUT should contain HTML from the local file
-    assert_eq!(
-        std::str::from_utf8(&out.stdout).unwrap(),
-        "\
-<!DOCTYPE html><html lang=\"en\"><head>\n  \
-<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
-<title>Local HTML file</title>\n  \
-<link href=\"data:text/css;base64,Ym9keSB7CiAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMDAwOwogICAgY29sb3I6ICNmZmY7Cn0K\" rel=\"stylesheet\" type=\"text/css\">\n  \
-<link href=\"data:text/css;base64,\" rel=\"stylesheet\" type=\"text/css\">\n</head>\n\n<body>\n  \
-<img alt=\"\" src=\"\">\n  \
-<a href=\"file://local-file.html/\">Tricky href</a>\n  \
-<a href=\"https://github.com/Y2Z/monolith\">Remote URL</a>\n  \
-<script src=\"data:application/javascript;base64,ZG9jdW1lbnQuYm9keS5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiZ3JlZW4iOwpkb2N1bWVudC5ib2R5LnN0eWxlLmNvbG9yID0gInJlZCI7Cg==\"></script>\n\n\n\n\
-</body></html>\n\
-"
-    );
-
-    // STDERR should contain list of retrieved file URLs
-    assert_eq!(
-        std::str::from_utf8(&out.stderr).unwrap(),
-        format!(
+        // STDOUT should contain HTML from the local file
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
            "\
-{file}{cwd}/src/tests/data/local-file.html\n\
-{file}{cwd}/src/tests/data/local-style.css\n\
-{file}{cwd}/src/tests/data/local-script.js\n\
-",
-            file = file_url_protocol,
-            cwd = cwd_normalized
-        )
-    );
+            <!DOCTYPE html><html lang=\"en\"><head>\n  \
+            <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
+            <title>Local HTML file</title>\n  \
+            <link rel=\"stylesheet\" type=\"text/css\" href=\"data:text/css;base64,Ym9keSB7CiAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMDAwOwogICAgY29sb3I6ICNmZmY7Cn0K\">\n  \
+            <link rel=\"stylesheet\" type=\"text/css\">\n</head>\n\n<body>\n  \
+            <img alt=\"\">\n  \
+            <a href=\"file://local-file.html/\">Tricky href</a>\n  \
+            <a href=\"https://github.com/Y2Z/monolith\">Remote URL</a>\n  \
+            <script src=\"data:application/javascript;base64,ZG9jdW1lbnQuYm9keS5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiZ3JlZW4iOwpkb2N1bWVudC5ib2R5LnN0eWxlLmNvbG9yID0gInJlZCI7Cg==\"></script>\n\n\n\n\
+            </body></html>\n\
+            "
+        );

-    // The exit code should be 0
-    out.assert().code(0);
-
-    Ok(())
-}
-
-#[test]
-fn passing_local_file_target_input_absolute_target_path() -> Result<(), Box<dyn std::error::Error>>
-{
-    let cwd = env::current_dir().unwrap();
-    let cwd_normalized: String =
-        str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let out = cmd
-        .arg("-jciI")
-        .arg(if cfg!(windows) {
+        // STDERR should contain list of retrieved file URLs
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
            format!(
-                "{cwd}\\src\\tests\\data\\local-file.html",
-                cwd = cwd.to_str().unwrap()
+                "\
+                {file}{cwd}/src/tests/data/basic/local-file.html\n\
+                {file}{cwd}/src/tests/data/basic/local-style.css\n\
+                {file}{cwd}/src/tests/data/basic/local-script.js\n\
+                ",
+                file = file_url_protocol,
+                cwd = cwd_normalized
            )
-        } else {
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+
+        Ok(())
+    }
+
+    #[test]
+    fn local_file_target_input_absolute_target_path() -> Result<(), Box<dyn std::error::Error>> {
+        let cwd = env::current_dir().unwrap();
+        let cwd_normalized: String =
+            str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let out = cmd
+            .arg("-M")
+            .arg("-jciI")
+            .arg(if cfg!(windows) {
+                format!(
+                    "{cwd}\\src\\tests\\data\\basic\\local-file.html",
+                    cwd = cwd.to_str().unwrap()
+                )
+            } else {
+                format!(
+                    "{cwd}/src/tests/data/basic/local-file.html",
+                    cwd = cwd.to_str().unwrap()
+                )
+            })
+            .output()
+            .unwrap();
+        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
+
+        // STDOUT should contain HTML from the local file
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
            format!(
-                "{cwd}/src/tests/data/local-file.html",
-                cwd = cwd.to_str().unwrap()
+                "\
+                <!DOCTYPE html><html lang=\"en\"><head>\
+                <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:; style-src 'none'; script-src 'none'; img-src data:;\"></meta>\n  \
+                <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
+                <title>Local HTML file</title>\n  \
+                <link rel=\"stylesheet\" type=\"text/css\">\n  \
+                <link rel=\"stylesheet\" type=\"text/css\">\n</head>\n\n<body>\n  \
+                <img alt=\"\" src=\"{empty_image}\">\n  \
+                <a href=\"file://local-file.html/\">Tricky href</a>\n  \
+                <a href=\"https://github.com/Y2Z/monolith\">Remote URL</a>\n  \
+                <script></script>\n\n\n\n\
+                </body></html>\n\
+                ",
+                empty_image = empty_image!()
            )
-        })
-        .output()
-        .unwrap();
-    let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
+        );

-    // STDOUT should contain HTML from the local file
-    assert_eq!(
-        std::str::from_utf8(&out.stdout).unwrap(),
-        format!(
-            "\
-<!DOCTYPE html><html lang=\"en\"><head>\
-<meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:; style-src 'none'; script-src 'none'; img-src data:;\"></meta>\n  \
-<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
-<title>Local HTML file</title>\n  \
-<link href=\"\" rel=\"stylesheet\" type=\"text/css\">\n  \
-<link href=\"\" rel=\"stylesheet\" type=\"text/css\">\n</head>\n\n<body>\n  \
-<img alt=\"\" src=\"{empty_image}\">\n  \
-<a href=\"file://local-file.html/\">Tricky href</a>\n  \
-<a href=\"https://github.com/Y2Z/monolith\">Remote URL</a>\n  \
-<script src=\"\"></script>\n\n\n\n\
-</body></html>\n\
-",
-            empty_image = empty_image!()
-        )
-    );
-
-    // STDERR should contain only the target file
-    assert_eq!(
-        std::str::from_utf8(&out.stderr).unwrap(),
-        format!(
-            "{file}{cwd}/src/tests/data/local-file.html\n",
-            file = file_url_protocol,
-            cwd = cwd_normalized,
-        )
-    );
-
-    // The exit code should be 0
-    out.assert().code(0);
-
-    Ok(())
-}
-
-#[test]
-fn passing_local_file_url_target_input() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let cwd_normalized: String =
-        str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
-    let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
-    let out = cmd
-        .arg("-cji")
-        .arg(if cfg!(windows) {
+        // STDERR should contain only the target file
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
            format!(
-                "{file}{cwd}/src/tests/data/local-file.html",
+                "{file}{cwd}/src/tests/data/basic/local-file.html\n",
                file = file_url_protocol,
                cwd = cwd_normalized,
            )
-        } else {
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+
+        Ok(())
+    }
+
+    #[test]
+    fn local_file_url_target_input() -> Result<(), Box<dyn std::error::Error>> {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let cwd_normalized: String =
+            str!(env::current_dir().unwrap().to_str().unwrap()).replace("\\", "/");
+        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
+        let out = cmd
+            .arg("-M")
+            .arg("-cji")
+            .arg(if cfg!(windows) {
+                format!(
+                    "{file}{cwd}/src/tests/data/basic/local-file.html",
+                    file = file_url_protocol,
+                    cwd = cwd_normalized,
+                )
+            } else {
+                format!(
+                    "{file}{cwd}/src/tests/data/basic/local-file.html",
+                    file = file_url_protocol,
+                    cwd = cwd_normalized,
+                )
+            })
+            .output()
+            .unwrap();
+
+        // STDOUT should contain HTML from the local file
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
            format!(
-                "{file}{cwd}/src/tests/data/local-file.html",
-                file = file_url_protocol,
-                cwd = cwd_normalized,
+                "\
+                <!DOCTYPE html><html lang=\"en\"><head>\
+                <meta http-equiv=\"Content-Security-Policy\" content=\"style-src 'none'; script-src 'none'; img-src data:;\"></meta>\n  \
+                <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
+                <title>Local HTML file</title>\n  \
+                <link rel=\"stylesheet\" type=\"text/css\">\n  \
+                <link rel=\"stylesheet\" type=\"text/css\">\n</head>\n\n<body>\n  \
+                <img alt=\"\" src=\"{empty_image}\">\n  \
+                <a href=\"file://local-file.html/\">Tricky href</a>\n  \
+                <a href=\"https://github.com/Y2Z/monolith\">Remote URL</a>\n  \
+                <script></script>\n\n\n\n\
+                </body></html>\n\
+                ",
+                empty_image = empty_image!()
            )
-        })
-        .output()
-        .unwrap();
+        );

-    // STDOUT should contain HTML from the local file
-    assert_eq!(
-        std::str::from_utf8(&out.stdout).unwrap(),
-        format!(
-            "\
-<!DOCTYPE html><html lang=\"en\"><head>\
-<meta http-equiv=\"Content-Security-Policy\" content=\"style-src 'none'; script-src 'none'; img-src data:;\"></meta>\n  \
-<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n  \
-<title>Local HTML file</title>\n  \
-<link href=\"\" rel=\"stylesheet\" type=\"text/css\">\n  \
-<link href=\"\" rel=\"stylesheet\" type=\"text/css\">\n</head>\n\n<body>\n  \
-<img alt=\"\" src=\"{empty_image}\">\n  \
-<a href=\"file://local-file.html/\">Tricky href</a>\n  \
-<a href=\"https://github.com/Y2Z/monolith\">Remote URL</a>\n  \
-<script src=\"\"></script>\n\n\n\n\
-</body></html>\n\
-",
-            empty_image = empty_image!()
-        )
-    );
+        // STDERR should contain list of retrieved file URLs
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            if cfg!(windows) {
+                format!(
+                    "{file}{cwd}/src/tests/data/basic/local-file.html\n",
+                    file = file_url_protocol,
+                    cwd = cwd_normalized,
+                )
+            } else {
+                format!(
+                    "{file}{cwd}/src/tests/data/basic/local-file.html\n",
+                    file = file_url_protocol,
+                    cwd = cwd_normalized,
+                )
+            }
+        );

-    // STDERR should contain list of retrieved file URLs
-    assert_eq!(
-        std::str::from_utf8(&out.stderr).unwrap(),
-        if cfg!(windows) {
-            format!(
-                "{file}{cwd}/src/tests/data/local-file.html\n",
-                file = file_url_protocol,
-                cwd = cwd_normalized,
-            )
-        } else {
-            format!(
-                "{file}{cwd}/src/tests/data/local-file.html\n",
-                file = file_url_protocol,
-                cwd = cwd_normalized,
-            )
-        }
-    );
+        // The exit code should be 0
+        out.assert().code(0);

-    // The exit code should be 0
-    out.assert().code(0);
+        Ok(())
+    }

-    Ok(())
-}
+    #[test]
+    fn security_disallow_local_assets_within_data_url_targets(
+    ) -> Result<(), Box<dyn std::error::Error>> {
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let out = cmd
+            .arg("-M")
+            .arg("data:text/html,%3Cscript%20src=\"src/tests/data/basic/local-script.js\"%3E%3C/script%3E")
+            .output()
+            .unwrap();

-#[test]
-fn passing_security_disallow_local_assets_within_data_url_targets(
-) -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let out = cmd
-        .arg("data:text/html,%3Cscript%20src=\"src/tests/data/local-script.js\"%3E%3C/script%3E")
-        .output()
-        .unwrap();
+        // STDOUT should contain HTML with no JS in it
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head><script></script></head><body></body></html>\n"
+        );

-    // STDOUT should contain HTML with no JS in it
-    assert_eq!(
-        std::str::from_utf8(&out.stdout).unwrap(),
-        "<html><head><script src=\"\"></script></head><body></body></html>\n"
-    );
+        // STDERR should be empty
+        assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");

-    // STDERR should be empty
-    assert_eq!(std::str::from_utf8(&out.stderr).unwrap(), "");
+        // The exit code should be 0
+        out.assert().code(0);

-    // The exit code should be 0
-    out.assert().code(0);
+        Ok(())
+    }

-    Ok(())
-}
-
-#[test]
-fn passing_embed_file_url_local_asset_within_style_attribute(
-) -> Result<(), Box<dyn std::error::Error>> {
-    let file_url_prefix: &str = if cfg!(windows) { "file:///" } else { "file://" };
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let mut file_svg = NamedTempFile::new()?;
-    writeln!(file_svg, "<svg version=\"1.1\" baseProfile=\"full\" width=\"300\" height=\"200\" xmlns=\"http://www.w3.org/2000/svg\">\
-<rect width=\"100%\" height=\"100%\" fill=\"red\" />\
-<circle cx=\"150\" cy=\"100\" r=\"80\" fill=\"green\" />\
-<text x=\"150\" y=\"125\" font-size=\"60\" text-anchor=\"middle\" fill=\"white\">SVG</text>\
-</svg>\n")?;
-    let mut file_html = NamedTempFile::new()?;
-    writeln!(
-        file_html,
-        "<div style='background-image: url(\"{file}{path}\")'></div>\n",
-        file = file_url_prefix,
-        path = str!(file_svg.path().to_str().unwrap()).replace("\\", "/"),
-    )?;
-    let out = cmd.arg(file_html.path()).output().unwrap();
-
-    // STDOUT should contain HTML with date URL for background-image in it
-    assert_eq!(
-        std::str::from_utf8(&out.stdout).unwrap(),
-        "<html><head></head><body><div style=\"background-image: url('data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGJhc2VQcm9maWxlPSJmdWxsIiB3aWR0aD0iMzAwIiBoZWlnaHQ9IjIwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJyZWQiIC8+PGNpcmNsZSBjeD0iMTUwIiBjeT0iMTAwIiByPSI4MCIgZmlsbD0iZ3JlZW4iIC8+PHRleHQgeD0iMTUwIiB5PSIxMjUiIGZvbnQtc2l6ZT0iNjAiIHRleHQtYW5jaG9yPSJtaWRkbGUiIGZpbGw9IndoaXRlIj5TVkc8L3RleHQ+PC9zdmc+Cgo=')\"></div>\n\n</body></html>\n"
-    );
-
-    // STDERR should list temporary files that got retrieved
-    assert_eq!(
-        std::str::from_utf8(&out.stderr).unwrap(),
-        format!(
-            "\
-{file}{html_path}\n\
-{file}{svg_path}\n\
-",
+    #[test]
+    fn embed_file_url_local_asset_within_style_attribute() -> Result<(), Box<dyn std::error::Error>>
+    {
+        let file_url_prefix: &str = if cfg!(windows) { "file:///" } else { "file://" };
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let mut file_svg = NamedTempFile::new()?;
+        writeln!(file_svg, "<svg version=\"1.1\" baseProfile=\"full\" width=\"300\" height=\"200\" xmlns=\"http://www.w3.org/2000/svg\">\
+                            <rect width=\"100%\" height=\"100%\" fill=\"red\" />\
+                            <circle cx=\"150\" cy=\"100\" r=\"80\" fill=\"green\" />\
+                            <text x=\"150\" y=\"125\" font-size=\"60\" text-anchor=\"middle\" fill=\"white\">SVG</text>\
+                            </svg>\n")?;
+        let mut file_html = NamedTempFile::new()?;
+        writeln!(
+            file_html,
+            "<div style='background-image: url(\"{file}{path}\")'></div>\n",
            file = file_url_prefix,
-            html_path = str!(file_html.path().to_str().unwrap()).replace("\\", "/"),
-            svg_path = str!(file_svg.path().to_str().unwrap()).replace("\\", "/"),
-        )
-    );
+            path = str!(file_svg.path().to_str().unwrap()).replace("\\", "/"),
+        )?;
+        let out = cmd.arg("-M").arg(file_html.path()).output().unwrap();

-    // The exit code should be 0
-    out.assert().code(0);
+        // STDOUT should contain HTML with date URL for background-image in it
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head></head><body><div style=\"background-image: url('data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGJhc2VQcm9maWxlPSJmdWxsIiB3aWR0aD0iMzAwIiBoZWlnaHQ9IjIwMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSJyZWQiIC8+PGNpcmNsZSBjeD0iMTUwIiBjeT0iMTAwIiByPSI4MCIgZmlsbD0iZ3JlZW4iIC8+PHRleHQgeD0iMTUwIiB5PSIxMjUiIGZvbnQtc2l6ZT0iNjAiIHRleHQtYW5jaG9yPSJtaWRkbGUiIGZpbGw9IndoaXRlIj5TVkc8L3RleHQ+PC9zdmc+Cgo=')\"></div>\n\n</body></html>\n"
+        );

-    Ok(())
-}
+        // STDERR should list temporary files that got retrieved
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "\
+                {file}{html_path}\n\
+                {file}{svg_path}\n\
+                ",
+                file = file_url_prefix,
+                html_path = str!(file_html.path().to_str().unwrap()).replace("\\", "/"),
+                svg_path = str!(file_svg.path().to_str().unwrap()).replace("\\", "/"),
+            )
+        );

-#[test]
-fn passing_css_import_string() -> Result<(), Box<dyn std::error::Error>> {
-    let file_url_prefix: &str = if cfg!(windows) { "file:///" } else { "file://" };
-    let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
-    let mut file_css = NamedTempFile::new()?;
-    writeln!(file_css, "body{{background-color:#000;color:#fff}}")?;
-    let mut file_html = NamedTempFile::new()?;
-    writeln!(
-        file_html,
-        "\
-<style>\n\
-@charset 'UTF-8';\n\
-\n\
-@import '{file}{css_path}';\n\
-\n\
-@import url({file}{css_path});\n\
-\n\
-@import url('{file}{css_path}')\n\
-</style>\n\
-",
-        file = file_url_prefix,
-        css_path = str!(file_css.path().to_str().unwrap()).replace("\\", "/"),
-    )?;
-    let out = cmd.arg(file_html.path()).output().unwrap();
+        // The exit code should be 0
+        out.assert().code(0);

-    // STDOUT should contain embedded CSS url()'s
-    assert_eq!(
-        std::str::from_utf8(&out.stdout).unwrap(),
-        "<html><head><style>\n@charset 'UTF-8';\n\n@import 'data:text/css;base64,Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOiMwMDA7Y29sb3I6I2ZmZn0K';\n\n@import url('data:text/css;base64,Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOiMwMDA7Y29sb3I6I2ZmZn0K');\n\n@import url('data:text/css;base64,Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOiMwMDA7Y29sb3I6I2ZmZn0K')\n</style>\n\n</head><body></body></html>\n"
-    );
+        Ok(())
+    }

-    // STDERR should list temporary files that got retrieved
-    assert_eq!(
-        std::str::from_utf8(&out.stderr).unwrap(),
-        format!(
+    #[test]
+    fn css_import_string() -> Result<(), Box<dyn std::error::Error>> {
+        let file_url_prefix: &str = if cfg!(windows) { "file:///" } else { "file://" };
+        let mut cmd = Command::cargo_bin(env!("CARGO_PKG_NAME"))?;
+        let mut file_css = NamedTempFile::new()?;
+        writeln!(file_css, "body{{background-color:#000;color:#fff}}")?;
+        let mut file_html = NamedTempFile::new()?;
+        writeln!(
+            file_html,
            "\
-{file}{html_path}\n\
-{file}{css_path}\n\
-{file}{css_path}\n\
-{file}{css_path}\n\
-",
+            <style>\n\
+            @charset 'UTF-8';\n\
+            \n\
+            @import '{file}{css_path}';\n\
+            \n\
+            @import url({file}{css_path});\n\
+            \n\
+            @import url('{file}{css_path}')\n\
+            </style>\n\
+            ",
            file = file_url_prefix,
-            html_path = str!(file_html.path().to_str().unwrap()).replace("\\", "/"),
            css_path = str!(file_css.path().to_str().unwrap()).replace("\\", "/"),
-        )
-    );
+        )?;
+        let out = cmd.arg("-M").arg(file_html.path()).output().unwrap();

-    // The exit code should be 0
-    out.assert().code(0);
+        // STDOUT should contain embedded CSS url()'s
+        assert_eq!(
+            std::str::from_utf8(&out.stdout).unwrap(),
+            "<html><head><style>\n@charset 'UTF-8';\n\n@import 'data:text/css;base64,Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOiMwMDA7Y29sb3I6I2ZmZn0K';\n\n@import url('data:text/css;base64,Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOiMwMDA7Y29sb3I6I2ZmZn0K');\n\n@import url('data:text/css;base64,Ym9keXtiYWNrZ3JvdW5kLWNvbG9yOiMwMDA7Y29sb3I6I2ZmZn0K')\n</style>\n\n</head><body></body></html>\n"
+        );

-    Ok(())
+        // STDERR should list temporary files that got retrieved
+        assert_eq!(
+            std::str::from_utf8(&out.stderr).unwrap(),
+            format!(
+                "\
+                {file}{html_path}\n\
+                {file}{css_path}\n\
+                {file}{css_path}\n\
+                {file}{css_path}\n\
+                ",
+                file = file_url_prefix,
+                html_path = str!(file_html.path().to_str().unwrap()).replace("\\", "/"),
+                css_path = str!(file_css.path().to_str().unwrap()).replace("\\", "/"),
+            )
+        );
+
+        // The exit code should be 0
+        out.assert().code(0);
+
+        Ok(())
+    }
 }
--- a/src/tests/css/embed_css.rs
+++ b/src/tests/css/embed_css.rs
@@ -1,8 +1,3 @@
-use reqwest::blocking::Client;
-use std::collections::HashMap;
-
-use crate::css;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -10,217 +5,315 @@ use crate::css;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_empty_input() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
+#[cfg(test)]
+mod passing {
+    use crate::css;
+    use reqwest::blocking::Client;
+    use std::collections::HashMap;

-    assert_eq!(css::embed_css(cache, &client, "", "", false, false,), "");
-}
-
-#[test]
-fn passing_style_exclude_unquoted_images() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const STYLE: &str = "/* border: none;*/\
-background-image: url(https://somewhere.com/bg.png); \
-list-style: url(/assets/images/bullet.svg);\
-width:99.998%; \
-margin-top: -20px; \
-line-height: -1; \
-height: calc(100vh - 10pt)";
-
-    assert_eq!(
-        css::embed_css(
-            cache,
-            &client,
-            "https://doesntmatter.local/",
-            &STYLE,
-            true,
-            true,
-        ),
-        format!(
-            "/* border: none;*/\
-background-image: url('{empty_image}'); \
-list-style: url('{empty_image}');\
-width:99.998%; \
-margin-top: -20px; \
-line-height: -1; \
-height: calc(100vh - 10pt)",
-            empty_image = empty_image!()
-        )
-    );
-}
-
-#[test]
-fn passing_style_exclude_single_quoted_images() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const STYLE: &str = "/* border: none;*/\
-background-image: url('https://somewhere.com/bg.png'); \
-list-style: url('/assets/images/bullet.svg');\
-width:99.998%; \
-margin-top: -20px; \
-line-height: -1; \
-height: calc(100vh - 10pt)";
-
-    assert_eq!(
-        css::embed_css(cache, &client, "", &STYLE, true, true,),
-        format!(
-            "/* border: none;*/\
-background-image: url('{empty_image}'); \
-list-style: url('{empty_image}');\
-width:99.998%; \
-margin-top: -20px; \
-line-height: -1; \
-height: calc(100vh - 10pt)",
-            empty_image = empty_image!()
-        )
-    );
-}
-
-#[test]
-fn passing_style_block() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const CSS: &str = "\
-#id.class-name:not(:nth-child(3n+0)) {\n  \
-  // border: none;\n  \
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=');\n\
-}\n\
-\n\
-html > body {}";
-
-    assert_eq!(
-        css::embed_css(cache, &client, "file:///", &CSS, false, true,),
-        CSS
-    );
-}
-
-#[test]
-fn passing_attribute_selectors() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const CSS: &str = "\
-[data-value] {
-    /* Attribute exists */
-}
-
-[data-value='foo'] {
-    /* Attribute has this exact value */
-}
-
-[data-value*='foo'] {
-    /* Attribute value contains this value somewhere in it */
-}
-
-[data-value~='foo'] {
-    /* Attribute has this value in a space-separated list somewhere */
-}
-
-[data-value^='foo'] {
-    /* Attribute value starts with this */
-}
-
-[data-value|='foo'] {
-    /* Attribute value starts with this in a dash-separated list */
-}
-
-[data-value$='foo'] {
-    /* Attribute value ends with this */
-}
-";
-
-    assert_eq!(css::embed_css(cache, &client, "", &CSS, false, false,), CSS);
-}
-
-#[test]
-fn passing_import_string() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const CSS: &str = "\
-@charset 'UTF-8';\n\
-\n\
-@import 'data:text/css,html{background-color:%23000}';\n\
-\n\
-@import url('data:text/css,html{color:%23fff}')\n\
-";
-
-    assert_eq!(
-        css::embed_css(
-            cache,
-            &client,
-            "https://doesntmatter.local/",
-            &CSS,
-            false,
-            true,
-        ),
-        "\
-@charset 'UTF-8';\n\
-\n\
-@import 'data:text/css;base64,ZGF0YTp0ZXh0L2NzcyxodG1se2JhY2tncm91bmQtY29sb3I6IzAwMH0=';\n\
-\n\
-@import url('data:text/css;base64,ZGF0YTp0ZXh0L2NzcyxodG1se2NvbG9yOiNmZmZ9')\n\
-"
-    );
-}
-
-#[test]
-fn passing_hash_urls() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const CSS: &str = "\
-body {\n    \
-    behavior: url(#default#something);\n\
-}\n\
-\n\
-.scissorHalf {\n    \
-    offset-path: url(#somePath);\n\
-}\n\
-";
-
-    assert_eq!(
-        css::embed_css(
-            cache,
-            &client,
-            "https://doesntmatter.local/",
-            &CSS,
-            false,
-            true,
-        ),
-        CSS
-    );
-}
-
-#[test]
-fn passing_transform_percentages_and_degrees() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    const CSS: &str = "\
-div {\n    \
-    transform: translate(-50%, -50%) rotate(-45deg);\n\
-    transform: translate(50%, 50%) rotate(45deg);\n\
-    transform: translate(+50%, +50%) rotate(+45deg);\n\
-}\n\
-\n\
-";
-
-    assert_eq!(
-        css::embed_css(
-            cache,
-            &client,
-            "https://doesntmatter.local/",
-            &CSS,
-            false,
-            true,
-        ),
-        CSS
-    );
+    #[test]
+    fn empty_input() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        assert_eq!(
+            css::embed_css(cache, &client, "", "", false, false, false,),
+            ""
+        );
+    }
+
+    #[test]
+    fn style_exclude_unquoted_images() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        const STYLE: &str = "/* border: none;*/\
+            background-image: url(https://somewhere.com/bg.png); \
+            list-style: url(/assets/images/bullet.svg);\
+            width:99.998%; \
+            margin-top: -20px; \
+            line-height: -1; \
+            height: calc(100vh - 10pt)";
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                &STYLE,
+                false,
+                true,
+                true,
+            ),
+            format!(
+                "/* border: none;*/\
+                background-image: url('{empty_image}'); \
+                list-style: url('{empty_image}');\
+                width:99.998%; \
+                margin-top: -20px; \
+                line-height: -1; \
+                height: calc(100vh - 10pt)",
+                empty_image = empty_image!()
+            )
+        );
+    }
+
+    #[test]
+    fn style_exclude_single_quoted_images() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        const STYLE: &str = "/* border: none;*/\
+            background-image: url('https://somewhere.com/bg.png'); \
+            list-style: url('/assets/images/bullet.svg');\
+            width:99.998%; \
+            margin-top: -20px; \
+            line-height: -1; \
+            height: calc(100vh - 10pt)";
+
+        assert_eq!(
+            css::embed_css(cache, &client, "", &STYLE, false, true, true,),
+            format!(
+                "/* border: none;*/\
+                background-image: url('{empty_image}'); \
+                list-style: url('{empty_image}');\
+                width:99.998%; \
+                margin-top: -20px; \
+                line-height: -1; \
+                height: calc(100vh - 10pt)",
+                empty_image = empty_image!()
+            )
+        );
+    }
+
+    #[test]
+    fn style_block() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        const CSS: &str = "\
+            #id.class-name:not(:nth-child(3n+0)) {\n  \
+            // border: none;\n  \
+            background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=');\n\
+            }\n\
+            \n\
+            html > body {}";
+
+        assert_eq!(
+            css::embed_css(cache, &client, "file:///", &CSS, false, false, true,),
+            CSS
+        );
+    }
+
+    #[test]
+    fn attribute_selectors() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        const CSS: &str = "\
+            [data-value] {
+                /* Attribute exists */
+            }
+
+            [data-value='foo'] {
+                /* Attribute has this exact value */
+            }
+
+            [data-value*='foo'] {
+                /* Attribute value contains this value somewhere in it */
+            }
+
+            [data-value~='foo'] {
+                /* Attribute has this value in a space-separated list somewhere */
+            }
+
+            [data-value^='foo'] {
+                /* Attribute value starts with this */
+            }
+
+            [data-value|='foo'] {
+                /* Attribute value starts with this in a dash-separated list */
+            }
+
+            [data-value$='foo'] {
+                /* Attribute value ends with this */
+            }
+            ";
+
+        assert_eq!(
+            css::embed_css(cache, &client, "", &CSS, false, false, false,),
+            CSS
+        );
+    }
+
+    #[test]
+    fn import_string() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        const CSS: &str = "\
+            @charset 'UTF-8';\n\
+            \n\
+            @import 'data:text/css,html{background-color:%23000}';\n\
+            \n\
+            @import url('data:text/css,html{color:%23fff}')\n\
+            ";
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                &CSS,
+                false,
+                false,
+                true,
+            ),
+            "\
+            @charset 'UTF-8';\n\
+            \n\
+            @import 'data:text/css;base64,aHRtbHtiYWNrZ3JvdW5kLWNvbG9yOiMwMDB9';\n\
+            \n\
+            @import url('data:text/css;base64,aHRtbHtjb2xvcjojZmZmfQ==')\n\
+            "
+        );
+    }
+
+    #[test]
+    fn hash_urls() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        const CSS: &str = "\
+            body {\n    \
+                behavior: url(#default#something);\n\
+            }\n\
+            \n\
+            .scissorHalf {\n    \
+                offset-path: url(#somePath);\n\
+            }\n\
+            ";
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                &CSS,
+                false,
+                false,
+                true,
+            ),
+            CSS
+        );
+    }
+
+    #[test]
+    fn transform_percentages_and_degrees() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        const CSS: &str = "\
+            div {\n    \
+                transform: translate(-50%, -50%) rotate(-45deg);\n\
+                transform: translate(50%, 50%) rotate(45deg);\n\
+                transform: translate(+50%, +50%) rotate(+45deg);\n\
+            }\n\
+            ";
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                &CSS,
+                false,
+                false,
+                true,
+            ),
+            CSS
+        );
+    }
+
+    #[test]
+    fn unusual_indents() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        const CSS: &str = "\
+            .is\\:good:hover {\n    \
+                color: green\n\
+            }\n\
+            \n\
+            #\\~\\!\\@\\$\\%\\^\\&\\*\\(\\)\\+\\=\\,\\.\\/\\\\\\'\\\"\\;\\:\\?\\>\\<\\[\\]\\{\\}\\|\\`\\# {\n    \
+                color: black\n\
+            }\n\
+            ";
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                &CSS,
+                false,
+                false,
+                true,
+            ),
+            CSS
+        );
+    }
+
+    #[test]
+    fn exclude_fonts() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        const CSS: &str = "\
+            @font-face {\n    \
+                font-family: 'My Font';\n    \
+                src: url(my_font.woff);\n\
+            }\n\
+            \n\
+            #identifier {\n    \
+                font-family: 'My Font' Arial\n\
+            }\n\
+            \n\
+            @font-face {\n    \
+                font-family: 'My Font';\n    \
+                src: url(my_font.woff);\n\
+            }\n\
+            \n\
+            div {\n    \
+                font-family: 'My Font' Verdana\n\
+            }\n\
+            ";
+
+        const CSS_OUT: &str = " \
+            \n\
+            \n\
+            #identifier {\n    \
+                font-family: 'My Font' Arial\n\
+            }\n\
+            \n \
+            \n\
+            \n\
+            div {\n    \
+                font-family: 'My Font' Verdana\n\
+            }\n\
+            ";
+
+        assert_eq!(
+            css::embed_css(
+                cache,
+                &client,
+                "https://doesntmatter.local/",
+                &CSS,
+                true,
+                false,
+                true,
+            ),
+            CSS_OUT
+        );
+    }
 }
--- a/src/tests/css/enquote.rs
+++ b/src/tests/css/enquote.rs
@@ -1,5 +1,3 @@
-use crate::css;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,44 +5,49 @@ use crate::css;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_empty_input_single_quotes() {
-    assert_eq!(css::enquote(str!(""), false), "''");
-}
+#[cfg(test)]
+mod passing {
+    use crate::css;

-#[test]
-fn passing_empty_input_double_quotes() {
-    assert_eq!(css::enquote(str!(""), true), "\"\"");
-}
+    #[test]
+    fn empty_input_single_quotes() {
+        assert_eq!(css::enquote(str!(""), false), "''");
+    }

-#[test]
-fn passing_apostrophes_single_quotes() {
-    assert_eq!(
-        css::enquote(str!("It's a lovely day, don't you think?"), false),
-        "'It\\'s a lovely day, don\\'t you think?'"
-    );
-}
+    #[test]
+    fn empty_input_double_quotes() {
+        assert_eq!(css::enquote(str!(""), true), "\"\"");
+    }

-#[test]
-fn passing_apostrophes_double_quotes() {
-    assert_eq!(
-        css::enquote(str!("It's a lovely day, don't you think?"), true),
-        "\"It's a lovely day, don't you think?\""
-    );
-}
+    #[test]
+    fn apostrophes_single_quotes() {
+        assert_eq!(
+            css::enquote(str!("It's a lovely day, don't you think?"), false),
+            "'It\\'s a lovely day, don\\'t you think?'"
+        );
+    }

-#[test]
-fn passing_feet_and_inches_single_quotes() {
-    assert_eq!(
-        css::enquote(str!("5'2\", 6'5\""), false),
-        "'5\\'2\", 6\\'5\"'"
-    );
-}
+    #[test]
+    fn apostrophes_double_quotes() {
+        assert_eq!(
+            css::enquote(str!("It's a lovely day, don't you think?"), true),
+            "\"It's a lovely day, don't you think?\""
+        );
+    }

-#[test]
-fn passing_feet_and_inches_double_quotes() {
-    assert_eq!(
-        css::enquote(str!("5'2\", 6'5\""), true),
-        "\"5'2\\\", 6'5\\\"\""
-    );
+    #[test]
+    fn feet_and_inches_single_quotes() {
+        assert_eq!(
+            css::enquote(str!("5'2\", 6'5\""), false),
+            "'5\\'2\", 6\\'5\"'"
+        );
+    }
+
+    #[test]
+    fn feet_and_inches_double_quotes() {
+        assert_eq!(
+            css::enquote(str!("5'2\", 6'5\""), true),
+            "\"5'2\\\", 6'5\\\"\""
+        );
+    }
 }
--- a/src/tests/data/basic/local-file.html
+++ b/src/tests/data/basic/local-file.html
--- a/src/tests/data/basic/local-script.js
+++ b/src/tests/data/basic/local-script.js
--- a/src/tests/data/basic/local-style.css
+++ b/src/tests/data/basic/local-style.css
--- a/src/tests/html/embed_srcset.rs
+++ b/src/tests/html/embed_srcset.rs
@@ -0,0 +1,26 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use crate::html;
+    use reqwest::blocking::Client;
+    use std::collections::HashMap;
+
+    #[test]
+    fn replace_with_empty_images() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let srcset_value = "small.png 1x, large.png 2x";
+        let embedded_css = html::embed_srcset(cache, &client, "", &srcset_value, true, true);
+
+        assert_eq!(
+            format!("{} 1x, {} 2x", empty_image!(), empty_image!()),
+            embedded_css
+        );
+    }
+}
--- a/src/tests/html/get_node_name.rs
+++ b/src/tests/html/get_node_name.rs
@@ -1,6 +1,3 @@
-use crate::html;
-use html5ever::rcdom::{Handle, NodeData};
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -8,42 +5,48 @@ use html5ever::rcdom::{Handle, NodeData};
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn get_node_name() {
-    let html = "<!doctype html><html><HEAD></HEAD><body><div><P></P></div></body></html>";
-    let dom = html::html_to_dom(&html);
-    let mut count = 0;
+#[cfg(test)]
+mod passing {
+    use crate::html;
+    use html5ever::rcdom::{Handle, NodeData};

-    fn test_walk(node: &Handle, i: &mut i8) {
-        *i += 1;
+    #[test]
+    fn get_node_name() {
+        let html = "<!doctype html><html><HEAD></HEAD><body><div><P></P></div></body></html>";
+        let dom = html::html_to_dom(&html);
+        let mut count = 0;

-        match &node.data {
-            NodeData::Document => {
-                for child in node.children.borrow().iter() {
-                    test_walk(child, &mut *i);
-                }
-            }
-            NodeData::Element { ref name, .. } => {
-                let node_name = name.local.as_ref().to_string();
-                let parent = html::get_parent_node(node);
-                let parent_node_name = html::get_node_name(&parent);
-                if node_name == "head" || node_name == "body" {
-                    assert_eq!(parent_node_name, Some("html"));
-                } else if node_name == "div" {
-                    assert_eq!(parent_node_name, Some("body"));
-                } else if node_name == "p" {
-                    assert_eq!(parent_node_name, Some("div"));
-                }
+        fn test_walk(node: &Handle, i: &mut i8) {
+            *i += 1;

-                for child in node.children.borrow().iter() {
-                    test_walk(child, &mut *i);
+            match &node.data {
+                NodeData::Document => {
+                    for child in node.children.borrow().iter() {
+                        test_walk(child, &mut *i);
+                    }
                }
-            }
-            _ => (),
-        };
+                NodeData::Element { ref name, .. } => {
+                    let node_name = name.local.as_ref().to_string();
+                    let parent = html::get_parent_node(node);
+                    let parent_node_name = html::get_node_name(&parent);
+                    if node_name == "head" || node_name == "body" {
+                        assert_eq!(parent_node_name, Some("html"));
+                    } else if node_name == "div" {
+                        assert_eq!(parent_node_name, Some("body"));
+                    } else if node_name == "p" {
+                        assert_eq!(parent_node_name, Some("div"));
+                    }
+
+                    for child in node.children.borrow().iter() {
+                        test_walk(child, &mut *i);
+                    }
+                }
+                _ => (),
+            };
+        }
+
+        test_walk(&dom.document, &mut count);
+
+        assert_eq!(count, 7);
    }
-
-    test_walk(&dom.document, &mut count);
-
-    assert_eq!(count, 7);
 }
--- a/src/tests/html/has_proper_integrity.rs
+++ b/src/tests/html/has_proper_integrity.rs
@@ -0,0 +1,92 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use crate::html;
+
+    #[test]
+    fn empty_input_sha256() {
+        assert!(html::has_proper_integrity(
+            "".as_bytes(),
+            "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="
+        ));
+    }
+
+    #[test]
+    fn sha256() {
+        assert!(html::has_proper_integrity(
+            "abcdef0123456789".as_bytes(),
+            "sha256-9EWAHgy4mSYsm54hmDaIDXPKLRsLnBX7lZyQ6xISNOM="
+        ));
+    }
+
+    #[test]
+    fn sha384() {
+        assert!(html::has_proper_integrity(
+            "abcdef0123456789".as_bytes(),
+            "sha384-gc9l7omltke8C33bedgh15E12M7RrAQa5t63Yb8APlpe7ZhiqV23+oqiulSJl3Kw"
+        ));
+    }
+
+    #[test]
+    fn sha512() {
+        assert!(html::has_proper_integrity(
+            "abcdef0123456789".as_bytes(),
+            "sha512-zG5B88cYMqcdiMi9gz0XkOFYw2BpjeYdn5V6+oFrMgSNjRpqL7EF8JEwl17ztZbK3N7I/tTwp3kxQbN1RgFBww=="
+        ));
+    }
+}
+
+//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
+//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
+//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
+//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod failing {
+    use crate::html;
+
+    #[test]
+    fn empty_hash() {
+        assert!(!html::has_proper_integrity(
+            "abcdef0123456789".as_bytes(),
+            ""
+        ));
+    }
+
+    #[test]
+    fn empty_input_empty_hash() {
+        assert!(!html::has_proper_integrity("".as_bytes(), ""));
+    }
+
+    #[test]
+    fn sha256() {
+        assert!(!html::has_proper_integrity(
+            "abcdef0123456789".as_bytes(),
+            "sha256-badhash"
+        ));
+    }
+
+    #[test]
+    fn sha384() {
+        assert!(!html::has_proper_integrity(
+            "abcdef0123456789".as_bytes(),
+            "sha384-badhash"
+        ));
+    }
+
+    #[test]
+    fn sha512() {
+        assert!(!html::has_proper_integrity(
+            "abcdef0123456789".as_bytes(),
+            "sha512-badhash"
+        ));
+    }
+}
--- a/src/tests/html/is_icon.rs
+++ b/src/tests/html/is_icon.rs
@@ -1,5 +1,3 @@
-use crate::html;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,29 +5,34 @@ use crate::html;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_icon() {
-    assert!(html::is_icon("icon"));
-}
+#[cfg(test)]
+mod passing {
+    use crate::html;

-#[test]
-fn passing_shortcut_icon_capitalized() {
-    assert!(html::is_icon("Shortcut Icon"));
-}
+    #[test]
+    fn icon() {
+        assert!(html::is_icon("icon"));
+    }

-#[test]
-fn passing_icon_uppercase() {
-    assert!(html::is_icon("ICON"));
-}
+    #[test]
+    fn shortcut_icon_capitalized() {
+        assert!(html::is_icon("Shortcut Icon"));
+    }

-#[test]
-fn passing_mask_icon() {
-    assert!(html::is_icon("mask-icon"));
-}
+    #[test]
+    fn icon_uppercase() {
+        assert!(html::is_icon("ICON"));
+    }

-#[test]
-fn passing_fluid_icon() {
-    assert!(html::is_icon("fluid-icon"));
+    #[test]
+    fn mask_icon() {
+        assert!(html::is_icon("mask-icon"));
+    }
+
+    #[test]
+    fn fluid_icon() {
+        assert!(html::is_icon("fluid-icon"));
+    }
 }

 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -39,12 +42,17 @@ fn passing_fluid_icon() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn failing_stylesheet() {
-    assert!(!html::is_icon("stylesheet"));
-}
+#[cfg(test)]
+mod failing {
+    use crate::html;

-#[test]
-fn failing_empty_string() {
-    assert!(!html::is_icon(""));
+    #[test]
+    fn stylesheet() {
+        assert!(!html::is_icon("stylesheet"));
+    }
+
+    #[test]
+    fn empty_string() {
+        assert!(!html::is_icon(""));
+    }
 }
--- a/src/tests/html/mod.rs
+++ b/src/tests/html/mod.rs
@@ -1,4 +1,6 @@
+mod embed_srcset;
 mod get_node_name;
+mod has_proper_integrity;
 mod is_icon;
 mod stringify_document;
 mod walk_and_embed_assets;
--- a/src/tests/html/stringify_document.rs
+++ b/src/tests/html/stringify_document.rs
@@ -1,5 +1,3 @@
-use crate::html;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,182 +5,187 @@ use crate::html;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_div_as_root_element() {
-    let html = "<div><script src=\"some.js\"></script></div>";
-    let dom = html::html_to_dom(&html);
+#[cfg(test)]
+mod passing {
+    use crate::html;

-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_isolate: bool = false;
+    #[test]
+    fn div_as_root_element() {
+        let html = "<div><script src=\"some.js\"></script></div>";
+        let dom = html::html_to_dom(&html);

-    assert_eq!(
-        html::stringify_document(
-            &dom.document,
-            opt_no_css,
-            opt_no_frames,
-            opt_no_js,
-            opt_no_images,
-            opt_isolate,
-        ),
-        "<html><head></head><body><div><script src=\"some.js\"></script></div></body></html>"
-    );
-}
+        let opt_no_css: bool = false;
+        let opt_no_frames: bool = false;
+        let opt_no_js: bool = false;
+        let opt_no_images: bool = false;
+        let opt_isolate: bool = false;

-#[test]
-fn passing_full_page_with_no_html_head_or_body() {
-    let html = "<title>Isolated document</title>\
-                <link rel=\"something\" href=\"some.css\" />\
-                <meta http-equiv=\"Content-Security-Policy\" content=\"default-src https:\">\
-                <div><script src=\"some.js\"></script></div>";
-    let dom = html::html_to_dom(&html);
+        assert_eq!(
+            html::stringify_document(
+                &dom.document,
+                opt_no_css,
+                opt_no_frames,
+                opt_no_js,
+                opt_no_images,
+                opt_isolate,
+            ),
+            "<html><head></head><body><div><script src=\"some.js\"></script></div></body></html>"
+        );
+    }

-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_isolate: bool = true;
-
-    assert_eq!(
-        html::stringify_document(
-            &dom.document,
-            opt_no_css,
-            opt_no_frames,
-            opt_no_js,
-            opt_no_images,
-            opt_isolate,
-        ),
-        "<html>\
-            <head>\
-                <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:;\"></meta>\
-                <title>Isolated document</title>\
-                <link rel=\"something\" href=\"some.css\">\
-                <meta http-equiv=\"Content-Security-Policy\" content=\"default-src https:\">\
-            </head>\
-            <body>\
-                <div>\
-                    <script src=\"some.js\"></script>\
-                </div>\
-            </body>\
-         </html>"
-    );
-}
-
-#[test]
-fn passing_doctype_and_the_rest_no_html_head_or_body() {
-    let html = "<!doctype html>\
-                <title>Unstyled document</title>\
-                <link rel=\"stylesheet\" href=\"main.css\"/>\
-                <div style=\"display: none;\"></div>";
-    let dom = html::html_to_dom(&html);
-
-    let opt_no_css: bool = true;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_isolate: bool = false;
-
-    assert_eq!(
-        html::stringify_document(
-            &dom.document,
-            opt_no_css,
-            opt_no_frames,
-            opt_no_js,
-            opt_no_images,
-            opt_isolate,
-        ),
-        "<!DOCTYPE html>\
-         <html>\
-         <head>\
-         <meta http-equiv=\"Content-Security-Policy\" content=\"style-src 'none';\"></meta>\
-         <title>Unstyled document</title>\
-         <link rel=\"stylesheet\" href=\"main.css\">\
-         </head>\
-         <body><div style=\"display: none;\"></div></body>\
-         </html>"
-    );
-}
-
-#[test]
-fn passing_doctype_and_the_rest_no_html_head_or_body_forbid_frames() {
-    let html = "<!doctype html>\
-                <title>Frameless document</title>\
-                <link rel=\"something\"/>\
-                <div><script src=\"some.js\"></script></div>";
-    let dom = html::html_to_dom(&html);
-
-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = true;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_isolate: bool = false;
-
-    assert_eq!(
-        html::stringify_document(
-            &dom.document,
-            opt_no_css,
-            opt_no_frames,
-            opt_no_js,
-            opt_no_images,
-            opt_isolate,
-        ),
-        "<!DOCTYPE html>\
-            <html>\
-            <head>\
-            <meta http-equiv=\"Content-Security-Policy\" content=\"frame-src 'none';child-src 'none';\"></meta>\
-            <title>Frameless document</title>\
-            <link rel=\"something\">\
-            </head>\
-            <body><div><script src=\"some.js\"></script></div></body>\
-            </html>"
-    );
-}
-
-#[test]
-fn passing_doctype_and_the_rest_all_forbidden() {
-    let html = "<!doctype html>\
-                <title>no-frame no-css no-js no-image isolated document</title>\
-                <meta http-equiv=\"Content-Security-Policy\" content=\"default-src https:\">\
-                <link rel=\"stylesheet\" href=\"some.css\">\
-                <div>\
-                <script src=\"some.js\"></script>\
-                <img style=\"width: 100%;\" src=\"some.png\" />\
-                <iframe src=\"some.html\"></iframe>\
-                </div>";
-    let dom = html::html_to_dom(&html);
-
-    let opt_isolate: bool = true;
-    let opt_no_css: bool = true;
-    let opt_no_frames: bool = true;
-    let opt_no_js: bool = true;
-    let opt_no_images: bool = true;
-
-    assert_eq!(
-        html::stringify_document(
-            &dom.document,
-            opt_no_css,
-            opt_no_frames,
-            opt_no_js,
-            opt_no_images,
-            opt_isolate,
-        ),
-        "<!DOCTYPE html>\
-            <html>\
-                <head>\
-                    <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:; style-src 'none'; frame-src 'none';child-src 'none'; script-src 'none'; img-src data:;\"></meta>\
-                    <title>no-frame no-css no-js no-image isolated document</title>\
+    #[test]
+    fn full_page_with_no_html_head_or_body() {
+        let html = "<title>Isolated document</title>\
+                    <link rel=\"something\" href=\"some.css\" />\
+                    <meta http-equiv=\"Content-Security-Policy\" content=\"default-src https:\">\
+                    <div><script src=\"some.js\"></script></div>";
+        let dom = html::html_to_dom(&html);
+
+        let opt_no_css: bool = false;
+        let opt_no_frames: bool = false;
+        let opt_no_js: bool = false;
+        let opt_no_images: bool = false;
+        let opt_isolate: bool = true;
+
+        assert_eq!(
+            html::stringify_document(
+                &dom.document,
+                opt_no_css,
+                opt_no_frames,
+                opt_no_js,
+                opt_no_images,
+                opt_isolate,
+            ),
+            "<html>\
+                <head>\
+                    <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:;\"></meta>\
+                    <title>Isolated document</title>\
+                    <link rel=\"something\" href=\"some.css\">\
                    <meta http-equiv=\"Content-Security-Policy\" content=\"default-src https:\">\
-                    <link rel=\"stylesheet\" href=\"some.css\">\
                </head>\
                <body>\
                    <div>\
                        <script src=\"some.js\"></script>\
-                        <img style=\"width: 100%;\" src=\"some.png\">\
-                        <iframe src=\"some.html\"></iframe>\
                    </div>\
                </body>\
            </html>"
-    );
+        );
+    }
+
+    #[test]
+    fn doctype_and_the_rest_no_html_head_or_body() {
+        let html = "<!doctype html>\
+                    <title>Unstyled document</title>\
+                    <link rel=\"stylesheet\" href=\"main.css\"/>\
+                    <div style=\"display: none;\"></div>";
+        let dom = html::html_to_dom(&html);
+
+        let opt_no_css: bool = true;
+        let opt_no_frames: bool = false;
+        let opt_no_js: bool = false;
+        let opt_no_images: bool = false;
+        let opt_isolate: bool = false;
+
+        assert_eq!(
+            html::stringify_document(
+                &dom.document,
+                opt_no_css,
+                opt_no_frames,
+                opt_no_js,
+                opt_no_images,
+                opt_isolate,
+            ),
+            "<!DOCTYPE html>\
+            <html>\
+            <head>\
+            <meta http-equiv=\"Content-Security-Policy\" content=\"style-src 'none';\"></meta>\
+            <title>Unstyled document</title>\
+            <link rel=\"stylesheet\" href=\"main.css\">\
+            </head>\
+            <body><div style=\"display: none;\"></div></body>\
+            </html>"
+        );
+    }
+
+    #[test]
+    fn doctype_and_the_rest_no_html_head_or_body_forbid_frames() {
+        let html = "<!doctype html>\
+                    <title>Frameless document</title>\
+                    <link rel=\"something\"/>\
+                    <div><script src=\"some.js\"></script></div>";
+        let dom = html::html_to_dom(&html);
+
+        let opt_no_css: bool = false;
+        let opt_no_frames: bool = true;
+        let opt_no_js: bool = false;
+        let opt_no_images: bool = false;
+        let opt_isolate: bool = false;
+
+        assert_eq!(
+            html::stringify_document(
+                &dom.document,
+                opt_no_css,
+                opt_no_frames,
+                opt_no_js,
+                opt_no_images,
+                opt_isolate,
+            ),
+            "<!DOCTYPE html>\
+                <html>\
+                <head>\
+                <meta http-equiv=\"Content-Security-Policy\" content=\"frame-src 'none';child-src 'none';\"></meta>\
+                <title>Frameless document</title>\
+                <link rel=\"something\">\
+                </head>\
+                <body><div><script src=\"some.js\"></script></div></body>\
+                </html>"
+        );
+    }
+
+    #[test]
+    fn doctype_and_the_rest_all_forbidden() {
+        let html = "<!doctype html>\
+                    <title>no-frame no-css no-js no-image isolated document</title>\
+                    <meta http-equiv=\"Content-Security-Policy\" content=\"default-src https:\">\
+                    <link rel=\"stylesheet\" href=\"some.css\">\
+                    <div>\
+                    <script src=\"some.js\"></script>\
+                    <img style=\"width: 100%;\" src=\"some.png\" />\
+                    <iframe src=\"some.html\"></iframe>\
+                    </div>";
+        let dom = html::html_to_dom(&html);
+
+        let opt_isolate: bool = true;
+        let opt_no_css: bool = true;
+        let opt_no_frames: bool = true;
+        let opt_no_js: bool = true;
+        let opt_no_images: bool = true;
+
+        assert_eq!(
+            html::stringify_document(
+                &dom.document,
+                opt_no_css,
+                opt_no_frames,
+                opt_no_js,
+                opt_no_images,
+                opt_isolate,
+            ),
+            "<!DOCTYPE html>\
+                <html>\
+                    <head>\
+                        <meta http-equiv=\"Content-Security-Policy\" content=\"default-src 'unsafe-inline' data:; style-src 'none'; frame-src 'none';child-src 'none'; script-src 'none'; img-src data:;\"></meta>\
+                        <title>no-frame no-css no-js no-image isolated document</title>\
+                        <meta http-equiv=\"Content-Security-Policy\" content=\"default-src https:\">\
+                        <link rel=\"stylesheet\" href=\"some.css\">\
+                    </head>\
+                    <body>\
+                        <div>\
+                            <script src=\"some.js\"></script>\
+                            <img style=\"width: 100%;\" src=\"some.png\">\
+                            <iframe src=\"some.html\"></iframe>\
+                        </div>\
+                    </body>\
+                </html>"
+        );
+    }
 }
--- a/src/tests/html/walk_and_embed_assets.rs
+++ b/src/tests/html/walk_and_embed_assets.rs
@@ -1,8 +1,3 @@
-use crate::html;
-use html5ever::serialize::{serialize, SerializeOpts};
-use reqwest::blocking::Client;
-use std::collections::HashMap;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -10,390 +5,419 @@ use std::collections::HashMap;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_basic() {
-    let cache = &mut HashMap::new();
+#[cfg(test)]
+mod passing {
+    use crate::html;
+    use html5ever::serialize::{serialize, SerializeOpts};
+    use reqwest::blocking::Client;
+    use std::collections::HashMap;

-    let html = "<div><P></P></div>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
+    #[test]
+    fn basic() {
+        let cache = &mut HashMap::new();

-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
+        let html = "<div><P></P></div>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";

-    let client = Client::new();
+        let opt_no_css: bool = false;
+        let opt_no_fonts: bool = false;
+        let opt_no_frames: bool = false;
+        let opt_no_js: bool = false;
+        let opt_no_images: bool = false;
+        let opt_silent = true;

-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-        opt_no_frames,
-    );
+        let client = Client::new();

-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+        html::walk_and_embed_assets(
+            cache,
+            &client,
+            &url,
+            &dom.document,
+            opt_no_css,
+            opt_no_fonts,
+            opt_no_frames,
+            opt_no_js,
+            opt_no_images,
+            opt_silent,
+        );

-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><body><div><p></p></div></body></html>"
-    );
-}
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();

-#[test]
-fn passing_ensure_no_recursive_iframe() {
-    let html = "<div><P></P><iframe src=\"\"></iframe></div>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><body><div><p></p></div></body></html>"
+        );
+    }

-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
+    #[test]
+    fn ensure_no_recursive_iframe() {
+        let html = "<div><P></P><iframe src=\"\"></iframe></div>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();

-    let client = Client::new();
+        let opt_no_css: bool = false;
+        let opt_no_fonts: bool = false;
+        let opt_no_frames: bool = false;
+        let opt_no_js: bool = false;
+        let opt_no_images: bool = false;
+        let opt_silent = true;

-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-        opt_no_frames,
-    );
+        let client = Client::new();

-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+        html::walk_and_embed_assets(
+            cache,
+            &client,
+            &url,
+            &dom.document,
+            opt_no_css,
+            opt_no_fonts,
+            opt_no_frames,
+            opt_no_js,
+            opt_no_images,
+            opt_silent,
+        );

-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><body><div><p></p><iframe src=\"\"></iframe></div></body></html>"
-    );
-}
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();

-#[test]
-fn passing_ensure_no_recursive_frame() {
-    let html = "<frameset><frame src=\"\"></frameset>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><body><div><p></p><iframe src=\"\"></iframe></div></body></html>"
+        );
+    }

-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
+    #[test]
+    fn ensure_no_recursive_frame() {
+        let html = "<frameset><frame src=\"\"></frameset>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();

-    let client = Client::new();
+        let opt_no_css: bool = false;
+        let opt_no_fonts: bool = false;
+        let opt_no_frames: bool = false;
+        let opt_no_js: bool = false;
+        let opt_no_images: bool = false;
+        let opt_silent = true;

-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-        opt_no_frames,
-    );
+        let client = Client::new();

-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+        html::walk_and_embed_assets(
+            cache,
+            &client,
+            &url,
+            &dom.document,
+            opt_no_css,
+            opt_no_fonts,
+            opt_no_frames,
+            opt_no_js,
+            opt_no_images,
+            opt_silent,
+        );

-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><frameset><frame src=\"\"></frameset></html>"
-    );
-}
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();

-#[test]
-fn passing_no_css() {
-    let html = "<link rel=\"stylesheet\" href=\"main.css\">\
-                <style>html{background-color: #000;}</style>\
-                <div style=\"display: none;\"></div>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><frameset><frame src=\"\"></frameset></html>"
+        );
+    }

-    let opt_no_css: bool = true;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
-    let client = Client::new();
+    #[test]
+    fn no_css() {
+        let html = "<link rel=\"stylesheet\" href=\"main.css\">\
+                    <style>html{background-color: #000;}</style>\
+                    <div style=\"display: none;\"></div>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();

-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-        opt_no_frames,
-    );
+        let opt_no_css: bool = true;
+        let opt_no_fonts: bool = false;
+        let opt_no_frames: bool = false;
+        let opt_no_js: bool = false;
+        let opt_no_images: bool = false;
+        let opt_silent = true;
+        let client = Client::new();

-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+        html::walk_and_embed_assets(
+            cache,
+            &client,
+            &url,
+            &dom.document,
+            opt_no_css,
+            opt_no_fonts,
+            opt_no_frames,
+            opt_no_js,
+            opt_no_images,
+            opt_silent,
+        );

-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html>\
-         <head>\
-         <link rel=\"stylesheet\" href=\"\">\
-         <style></style>\
-         </head>\
-         <body>\
-         <div></div>\
-         </body>\
-         </html>"
-    );
-}
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();

-#[test]
-fn passing_no_images() {
-    let html = "<link rel=\"icon\" href=\"favicon.ico\">\
-                <div><img src=\"http://localhost/assets/mono_lisa.png\" /></div>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
-
-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = true;
-    let opt_silent = true;
-
-    let client = Client::new();
-
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-        opt_no_frames,
-    );
-
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
-
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        format!(
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
            "<html>\
-         <head>\
-         <link rel=\"icon\" href=\"\">\
-         </head>\
-         <body>\
-         <div>\
-         <img src=\"{empty_image}\">\
-         </div>\
-         </body>\
-         </html>",
-            empty_image = empty_image!()
-        )
-    );
-}
-
-#[test]
-fn passing_no_body_background_images() {
-    let html = "<body background=\"no/such/image.png\" background=\"no/such/image2.png\"></body>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
-
-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = true;
-    let opt_silent = true;
-
-    let client = Client::new();
-
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-        opt_no_frames,
-    );
-
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
-
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><body></body></html>"
-    );
-}
-
-#[test]
-fn passing_no_frames() {
-    let html = "<frameset><frame src=\"http://trackbook.com\"></frameset>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
-
-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = true;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
-    let client = Client::new();
-
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-        opt_no_frames,
-    );
-
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
-
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><frameset><frame src=\"\"></frameset></html>"
-    );
-}
-
-#[test]
-fn passing_no_iframes() {
-    let html = "<iframe src=\"http://trackbook.com\"></iframe>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
-
-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = true;
-    let opt_no_js: bool = false;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
-    let client = Client::new();
-
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-        opt_no_frames,
-    );
-
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
-
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><body><iframe src=\"\"></iframe></body></html>"
-    );
-}
-
-#[test]
-fn passing_no_js() {
-    let html = "<div onClick=\"void(0)\">\
-                <script src=\"http://localhost/assets/some.js\"></script>\
-                <script>alert(1)</script>\
-                </div>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
-
-    let opt_no_css: bool = false;
-    let opt_no_frames: bool = false;
-    let opt_no_js: bool = true;
-    let opt_no_images: bool = false;
-    let opt_silent = true;
-
-    let client = Client::new();
-
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-        opt_no_frames,
-    );
-
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
-
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html><head></head><body><div><script src=\"\"></script>\
-         <script></script></div></body></html>"
-    );
-}
-
-#[test]
-fn passing_with_no_integrity() {
-    let html = "<title>No integrity</title>\
-                <link integrity=\"sha384-...\" rel=\"something\"/>\
-                <script integrity=\"sha384-...\" src=\"some.js\"></script>";
-    let dom = html::html_to_dom(&html);
-    let url = "http://localhost";
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-    let opt_no_css: bool = true;
-    let opt_no_frames: bool = true;
-    let opt_no_js: bool = true;
-    let opt_no_images: bool = true;
-    let opt_silent = true;
-
-    html::walk_and_embed_assets(
-        cache,
-        &client,
-        &url,
-        &dom.document,
-        opt_no_css,
-        opt_no_js,
-        opt_no_images,
-        opt_silent,
-        opt_no_frames,
-    );
-
-    let mut buf: Vec<u8> = Vec::new();
-    serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
-
-    assert_eq!(
-        buf.iter().map(|&c| c as char).collect::<String>(),
-        "<html>\
-         <head><title>No integrity</title><link rel=\"something\"><script src=\"\"></script></head>\
-         <body></body>\
-         </html>"
-    );
+            <head>\
+            <link rel=\"stylesheet\">\
+            <style></style>\
+            </head>\
+            <body>\
+            <div></div>\
+            </body>\
+            </html>"
+        );
+    }
+
+    #[test]
+    fn no_images() {
+        let html = "<link rel=\"icon\" href=\"favicon.ico\">\
+                    <div><img src=\"http://localhost/assets/mono_lisa.png\" /></div>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+
+        let opt_no_css: bool = false;
+        let opt_no_fonts: bool = false;
+        let opt_no_frames: bool = false;
+        let opt_no_js: bool = false;
+        let opt_no_images: bool = true;
+        let opt_silent = true;
+
+        let client = Client::new();
+
+        html::walk_and_embed_assets(
+            cache,
+            &client,
+            &url,
+            &dom.document,
+            opt_no_css,
+            opt_no_fonts,
+            opt_no_frames,
+            opt_no_js,
+            opt_no_images,
+            opt_silent,
+        );
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            format!(
+                "<html>\
+            <head>\
+            <link rel=\"icon\">\
+            </head>\
+            <body>\
+            <div>\
+            <img src=\"{empty_image}\">\
+            </div>\
+            </body>\
+            </html>",
+                empty_image = empty_image!()
+            )
+        );
+    }
+
+    #[test]
+    fn no_body_background_images() {
+        let html =
+            "<body background=\"no/such/image.png\" background=\"no/such/image2.png\"></body>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+
+        let opt_no_css: bool = false;
+        let opt_no_fonts: bool = false;
+        let opt_no_frames: bool = false;
+        let opt_no_js: bool = false;
+        let opt_no_images: bool = true;
+        let opt_silent = true;
+
+        let client = Client::new();
+
+        html::walk_and_embed_assets(
+            cache,
+            &client,
+            &url,
+            &dom.document,
+            opt_no_css,
+            opt_no_fonts,
+            opt_no_frames,
+            opt_no_js,
+            opt_no_images,
+            opt_silent,
+        );
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><body></body></html>"
+        );
+    }
+
+    #[test]
+    fn no_frames() {
+        let html = "<frameset><frame src=\"http://trackbook.com\"></frameset>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+
+        let opt_no_css: bool = false;
+        let opt_no_fonts: bool = false;
+        let opt_no_frames: bool = true;
+        let opt_no_js: bool = false;
+        let opt_no_images: bool = false;
+        let opt_silent = true;
+        let client = Client::new();
+
+        html::walk_and_embed_assets(
+            cache,
+            &client,
+            &url,
+            &dom.document,
+            opt_no_css,
+            opt_no_fonts,
+            opt_no_frames,
+            opt_no_js,
+            opt_no_images,
+            opt_silent,
+        );
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><frameset><frame src=\"\"></frameset></html>"
+        );
+    }
+
+    #[test]
+    fn no_iframes() {
+        let html = "<iframe src=\"http://trackbook.com\"></iframe>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+
+        let opt_no_css: bool = false;
+        let opt_no_fonts: bool = false;
+        let opt_no_frames: bool = true;
+        let opt_no_js: bool = false;
+        let opt_no_images: bool = false;
+        let opt_silent = true;
+        let client = Client::new();
+
+        html::walk_and_embed_assets(
+            cache,
+            &client,
+            &url,
+            &dom.document,
+            opt_no_css,
+            opt_no_fonts,
+            opt_no_frames,
+            opt_no_js,
+            opt_no_images,
+            opt_silent,
+        );
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><body><iframe src=\"\"></iframe></body></html>"
+        );
+    }
+
+    #[test]
+    fn no_js() {
+        let html = "<div onClick=\"void(0)\">\
+                    <script src=\"http://localhost/assets/some.js\"></script>\
+                    <script>alert(1)</script>\
+                    </div>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+
+        let opt_no_css: bool = false;
+        let opt_no_fonts: bool = false;
+        let opt_no_frames: bool = false;
+        let opt_no_js: bool = true;
+        let opt_no_images: bool = false;
+        let opt_silent = true;
+
+        let client = Client::new();
+
+        html::walk_and_embed_assets(
+            cache,
+            &client,
+            &url,
+            &dom.document,
+            opt_no_css,
+            opt_no_fonts,
+            opt_no_frames,
+            opt_no_js,
+            opt_no_images,
+            opt_silent,
+        );
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html><head></head><body><div><script></script>\
+            <script></script></div></body></html>"
+        );
+    }
+
+    #[test]
+    fn with_no_integrity() {
+        let html = "<title>No integrity</title>\
+                    <link integrity=\"sha384-...\" rel=\"something\"/>\
+                    <script integrity=\"sha384-...\" src=\"some.js\"></script>";
+        let dom = html::html_to_dom(&html);
+        let url = "http://localhost";
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+        let opt_no_css: bool = true;
+        let opt_no_fonts: bool = false;
+        let opt_no_frames: bool = true;
+        let opt_no_js: bool = true;
+        let opt_no_images: bool = true;
+        let opt_silent = true;
+
+        html::walk_and_embed_assets(
+            cache,
+            &client,
+            &url,
+            &dom.document,
+            opt_no_css,
+            opt_no_fonts,
+            opt_no_frames,
+            opt_no_js,
+            opt_no_images,
+            opt_silent,
+        );
+
+        let mut buf: Vec<u8> = Vec::new();
+        serialize(&mut buf, &dom.document, SerializeOpts::default()).unwrap();
+
+        assert_eq!(
+            buf.iter().map(|&c| c as char).collect::<String>(),
+            "<html>\
+            <head><title>No integrity</title><link rel=\"something\"><script></script></head>\
+            <body></body>\
+            </html>"
+        );
+    }
 }
--- a/src/tests/js/attr_is_event_handler.rs
+++ b/src/tests/js/attr_is_event_handler.rs
@@ -1,5 +1,3 @@
-use crate::js;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,19 +5,24 @@ use crate::js;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_onblur_camelcase() {
-    assert!(js::attr_is_event_handler("onBlur"));
-}
+#[cfg(test)]
+mod passing {
+    use crate::js;

-#[test]
-fn passing_onclick_lowercase() {
-    assert!(js::attr_is_event_handler("onclick"));
-}
+    #[test]
+    fn onblur_camelcase() {
+        assert!(js::attr_is_event_handler("onBlur"));
+    }

-#[test]
-fn passing_onclick_camelcase() {
-    assert!(js::attr_is_event_handler("onClick"));
+    #[test]
+    fn onclick_lowercase() {
+        assert!(js::attr_is_event_handler("onclick"));
+    }
+
+    #[test]
+    fn onclick_camelcase() {
+        assert!(js::attr_is_event_handler("onClick"));
+    }
 }

 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -29,17 +32,22 @@ fn passing_onclick_camelcase() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn failing_href() {
-    assert!(!js::attr_is_event_handler("href"));
-}
+#[cfg(test)]
+mod failing {
+    use crate::js;

-#[test]
-fn failing_empty_string() {
-    assert!(!js::attr_is_event_handler(""));
-}
+    #[test]
+    fn href() {
+        assert!(!js::attr_is_event_handler("href"));
+    }

-#[test]
-fn failing_class() {
-    assert!(!js::attr_is_event_handler("class"));
+    #[test]
+    fn empty_string() {
+        assert!(!js::attr_is_event_handler(""));
+    }
+
+    #[test]
+    fn class() {
+        assert!(!js::attr_is_event_handler("class"));
+    }
 }
--- a/src/tests/utils/clean_url.rs
+++ b/src/tests/utils/clean_url.rs
@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,26 +5,47 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_removes_fragment() {
-    assert_eq!(
-        utils::clean_url("https://somewhere.com/font.eot#iefix"),
-        "https://somewhere.com/font.eot"
-    );
-}
+#[cfg(test)]
+mod passing {
+    use crate::utils;

-#[test]
-fn passing_removes_empty_fragment() {
-    assert_eq!(
-        utils::clean_url("https://somewhere.com/font.eot#"),
-        "https://somewhere.com/font.eot"
-    );
-}
+    #[test]
+    fn removes_fragment() {
+        assert_eq!(
+            utils::clean_url("https://somewhere.com/font.eot#iefix"),
+            "https://somewhere.com/font.eot"
+        );
+    }

-#[test]
-fn passing_removes_empty_query_and_empty_fragment() {
-    assert_eq!(
-        utils::clean_url("https://somewhere.com/font.eot?#"),
-        "https://somewhere.com/font.eot"
-    );
+    #[test]
+    fn removes_empty_fragment() {
+        assert_eq!(
+            utils::clean_url("https://somewhere.com/font.eot#"),
+            "https://somewhere.com/font.eot"
+        );
+    }
+
+    #[test]
+    fn removes_empty_query_and_empty_fragment() {
+        assert_eq!(
+            utils::clean_url("https://somewhere.com/font.eot?#"),
+            "https://somewhere.com/font.eot"
+        );
+    }
+
+    #[test]
+    fn removes_empty_query_amp_and_empty_fragment() {
+        assert_eq!(
+            utils::clean_url("https://somewhere.com/font.eot?a=b&#"),
+            "https://somewhere.com/font.eot?a=b"
+        );
+    }
+
+    #[test]
+    fn keeps_credentials() {
+        assert_eq!(
+            utils::clean_url("https://cookie:monster@gibson.internet/"),
+            "https://cookie:monster@gibson.internet/"
+        );
+    }
 }
--- a/src/tests/utils/data_to_data_url.rs
+++ b/src/tests/utils/data_to_data_url.rs
@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,22 +5,27 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_encode_string_with_specific_media_type() {
-    let mime = "application/javascript";
-    let data = "var word = 'hello';\nalert(word);\n";
-    let data_url = utils::data_to_data_url(mime, data.as_bytes(), "", "");
+#[cfg(test)]
+mod passing {
+    use crate::utils;

-    assert_eq!(
-        &data_url,
-        "data:application/javascript;base64,dmFyIHdvcmQgPSAnaGVsbG8nOwphbGVydCh3b3JkKTsK"
-    );
-}
-
-#[test]
-fn passing_encode_append_fragment() {
-    let data = "<svg></svg>\n";
-    let data_url = utils::data_to_data_url("text/css", data.as_bytes(), "", "fragment");
-
-    assert_eq!(&data_url, "data:text/css;base64,PHN2Zz48L3N2Zz4K#fragment");
+    #[test]
+    fn encode_string_with_specific_media_type() {
+        let mime = "application/javascript";
+        let data = "var word = 'hello';\nalert(word);\n";
+        let data_url = utils::data_to_data_url(mime, data.as_bytes(), "", "");
+
+        assert_eq!(
+            &data_url,
+            "data:application/javascript;base64,dmFyIHdvcmQgPSAnaGVsbG8nOwphbGVydCh3b3JkKTsK"
+        );
+    }
+
+    #[test]
+    fn encode_append_fragment() {
+        let data = "<svg></svg>\n";
+        let data_url = utils::data_to_data_url("text/css", data.as_bytes(), "", "fragment");
+
+        assert_eq!(&data_url, "data:text/css;base64,PHN2Zz48L3N2Zz4K#fragment");
+    }
 }
--- a/src/tests/utils/data_url_to_data.rs
+++ b/src/tests/utils/data_url_to_data.rs
@@ -0,0 +1,104 @@
+//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
+//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
+//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
+//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod passing {
+    use crate::utils;
+
+    #[test]
+    fn parse_text_html_base64() {
+        let (media_type, data) = utils::data_url_to_data("data:text/html;base64,V29yayBleHBhbmRzIHNvIGFzIHRvIGZpbGwgdGhlIHRpbWUgYXZhaWxhYmxlIGZvciBpdHMgY29tcGxldGlvbg==");
+
+        assert_eq!(media_type, "text/html");
+        assert_eq!(
+            String::from_utf8_lossy(&data),
+            "Work expands so as to fill the time available for its completion"
+        );
+    }
+
+    #[test]
+    fn parse_text_html_utf8() {
+        let (media_type, data) = utils::data_url_to_data(
+            "data:text/html;utf8,Work expands so as to fill the time available for its completion",
+        );
+
+        assert_eq!(media_type, "text/html");
+        assert_eq!(
+            String::from_utf8_lossy(&data),
+            "Work expands so as to fill the time available for its completion"
+        );
+    }
+
+    #[test]
+    fn parse_text_html_plaintext() {
+        let (media_type, data) = utils::data_url_to_data(
+            "data:text/html,Work expands so as to fill the time available for its completion",
+        );
+
+        assert_eq!(media_type, "text/html");
+        assert_eq!(
+            String::from_utf8_lossy(&data),
+            "Work expands so as to fill the time available for its completion"
+        );
+    }
+
+    #[test]
+    fn parse_text_html_charset_utf_8_between_two_whitespaces() {
+        let (media_type, data) = utils::data_url_to_data(" data:text/html;charset=utf-8,Work expands so as to fill the time available for its completion ");
+
+        assert_eq!(media_type, "text/html");
+        assert_eq!(
+            String::from_utf8_lossy(&data),
+            "Work expands so as to fill the time available for its completion"
+        );
+    }
+
+    #[test]
+    fn parse_text_css_url_encoded() {
+        let (media_type, data) =
+            utils::data_url_to_data("data:text/css,div{background-color:%23000}");
+
+        assert_eq!(media_type, "text/css");
+        assert_eq!(String::from_utf8_lossy(&data), "div{background-color:#000}");
+    }
+
+    #[test]
+    fn parse_no_media_type_base64() {
+        let (media_type, data) = utils::data_url_to_data("data:;base64,dGVzdA==");
+
+        assert_eq!(media_type, "");
+        assert_eq!(String::from_utf8_lossy(&data), "test");
+    }
+
+    #[test]
+    fn parse_no_media_type_no_encoding() {
+        let (media_type, data) = utils::data_url_to_data("data:;,test%20test");
+
+        assert_eq!(media_type, "");
+        assert_eq!(String::from_utf8_lossy(&data), "test test");
+    }
+}
+
+//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
+//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
+//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
+//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
+//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
+//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
+
+#[cfg(test)]
+mod failing {
+    use crate::utils;
+
+    #[test]
+    fn just_word_data() {
+        let (media_type, data) = utils::data_url_to_data("data");
+
+        assert_eq!(media_type, "");
+        assert_eq!(String::from_utf8_lossy(&data), "");
+    }
+}
--- a/src/tests/utils/data_url_to_text.rs
+++ b/src/tests/utils/data_url_to_text.rs
@@ -1,58 +0,0 @@
-use crate::utils;
-
-//  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
-//  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
-//  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
-//  ██╔═══╝ ██╔══██║╚════██║╚════██║██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[test]
-fn passing_parse_text_html_base64() {
-    assert_eq!(
-        utils::data_url_to_text("data:text/html;base64,V29yayBleHBhbmRzIHNvIGFzIHRvIGZpbGwgdGhlIHRpbWUgYXZhaWxhYmxlIGZvciBpdHMgY29tcGxldGlvbg=="),
-        "Work expands so as to fill the time available for its completion"
-    );
-}
-
-#[test]
-fn passing_parse_text_html_utf8() {
-    assert_eq!(
-        utils::data_url_to_text(
-            "data:text/html;utf8,Work expands so as to fill the time available for its completion"
-        ),
-        "Work expands so as to fill the time available for its completion"
-    );
-}
-
-#[test]
-fn passing_parse_text_html_plaintext() {
-    assert_eq!(
-        utils::data_url_to_text(
-            "data:text/html,Work expands so as to fill the time available for its completion"
-        ),
-        "Work expands so as to fill the time available for its completion"
-    );
-}
-
-#[test]
-fn passing_parse_text_html_charset_utf_8_between_two_whitespaces() {
-    assert_eq!(
-        utils::data_url_to_text(
-            " data:text/html;charset=utf-8,Work expands so as to fill the time available for its completion "
-        ),
-        "Work expands so as to fill the time available for its completion"
-    );
-}
-
-//  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
-//  ██╔════╝██╔══██╗██║██║     ██║████╗  ██║██╔════╝
-//  █████╗  ███████║██║██║     ██║██╔██╗ ██║██║  ███╗
-//  ██╔══╝  ██╔══██║██║██║     ██║██║╚██╗██║██║   ██║
-//  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
-//  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝
-
-#[test]
-fn failing_just_word_data() {
-    assert_eq!(utils::data_url_to_text("data"), "");
-}
--- a/src/tests/utils/decode_url.rs
+++ b/src/tests/utils/decode_url.rs
@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,20 +5,35 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_decode_unicode_characters() {
-    assert_eq!(
-        utils::decode_url(str!(
-            "%E6%A4%9C%E3%83%92%E3%83%A0%E8%A7%A3%E5%A1%97%E3%82%83%E3%83%83%20%3D%20%E3%82%B5"
-        )),
-        "検ヒム解塗ゃッ = サ"
-    );
-}
+#[cfg(test)]
+mod passing {
+    use crate::utils;

-#[test]
-fn passing_decode_file_url() {
-    assert_eq!(
-        utils::decode_url(str!("file:///tmp/space%20here/test%231.html")),
-        "file:///tmp/space here/test#1.html"
-    );
+    #[test]
+    fn decode_unicode_characters() {
+        assert_eq!(
+            utils::decode_url(str!(
+                "%E6%A4%9C%E3%83%92%E3%83%A0%E8%A7%A3%E5%A1%97%E3%82%83%E3%83%83%20%3D%20%E3%82%B5"
+            )),
+            "検ヒム解塗ゃッ = サ"
+        );
+    }
+
+    #[test]
+    fn decode_file_url() {
+        assert_eq!(
+            utils::decode_url(str!("file:///tmp/space%20here/test%231.html")),
+            "file:///tmp/space here/test#1.html"
+        );
+    }
+
+    #[test]
+    fn plus_sign() {
+        assert_eq!(
+            utils::decode_url(str!(
+                "fonts.somewhere.com/css?family=Open+Sans:300,400,400italic,600,600italic"
+            )),
+            "fonts.somewhere.com/css?family=Open+Sans:300,400,400italic,600,600italic"
+        );
+    }
 }
--- a/src/tests/utils/detect_media_type.rs
+++ b/src/tests/utils/detect_media_type.rs
@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,131 +5,136 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_image_gif87() {
-    assert_eq!(utils::detect_media_type(b"GIF87a", ""), "image/gif");
-}
+#[cfg(test)]
+mod passing {
+    use crate::utils;

-#[test]
-fn passing_image_gif89() {
-    assert_eq!(utils::detect_media_type(b"GIF89a", ""), "image/gif");
-}
+    #[test]
+    fn image_gif87() {
+        assert_eq!(utils::detect_media_type(b"GIF87a", ""), "image/gif");
+    }

-#[test]
-fn passing_image_jpeg() {
-    assert_eq!(utils::detect_media_type(b"\xFF\xD8\xFF", ""), "image/jpeg");
-}
+    #[test]
+    fn image_gif89() {
+        assert_eq!(utils::detect_media_type(b"GIF89a", ""), "image/gif");
+    }

-#[test]
-fn passing_image_png() {
-    assert_eq!(
-        utils::detect_media_type(b"\x89PNG\x0D\x0A\x1A\x0A", ""),
-        "image/png"
-    );
-}
+    #[test]
+    fn image_jpeg() {
+        assert_eq!(utils::detect_media_type(b"\xFF\xD8\xFF", ""), "image/jpeg");
+    }

-#[test]
-fn passing_image_svg() {
-    assert_eq!(utils::detect_media_type(b"<svg ", ""), "image/svg+xml");
-}
+    #[test]
+    fn image_png() {
+        assert_eq!(
+            utils::detect_media_type(b"\x89PNG\x0D\x0A\x1A\x0A", ""),
+            "image/png"
+        );
+    }

-#[test]
-fn passing_image_webp() {
-    assert_eq!(
-        utils::detect_media_type(b"RIFF....WEBPVP8 ", ""),
-        "image/webp"
-    );
-}
+    #[test]
+    fn image_svg() {
+        assert_eq!(utils::detect_media_type(b"<svg ", ""), "image/svg+xml");
+    }

-#[test]
-fn passing_image_icon() {
-    assert_eq!(
-        utils::detect_media_type(b"\x00\x00\x01\x00", ""),
-        "image/x-icon"
-    );
-}
+    #[test]
+    fn image_webp() {
+        assert_eq!(
+            utils::detect_media_type(b"RIFF....WEBPVP8 ", ""),
+            "image/webp"
+        );
+    }

-#[test]
-fn passing_image_svg_filename() {
-    assert_eq!(
-        utils::detect_media_type(b"<?xml ", "local-file.svg"),
-        "image/svg+xml"
-    );
-}
+    #[test]
+    fn image_icon() {
+        assert_eq!(
+            utils::detect_media_type(b"\x00\x00\x01\x00", ""),
+            "image/x-icon"
+        );
+    }

-#[test]
-fn passing_image_svg_url_uppercase() {
-    assert_eq!(
-        utils::detect_media_type(b"", "https://some-site.com/images/local-file.SVG"),
-        "image/svg+xml"
-    );
-}
+    #[test]
+    fn image_svg_filename() {
+        assert_eq!(
+            utils::detect_media_type(b"<?xml ", "local-file.svg"),
+            "image/svg+xml"
+        );
+    }

-#[test]
-fn passing_audio_mpeg() {
-    assert_eq!(utils::detect_media_type(b"ID3", ""), "audio/mpeg");
-}
+    #[test]
+    fn image_svg_url_uppercase() {
+        assert_eq!(
+            utils::detect_media_type(b"", "https://some-site.com/images/local-file.SVG"),
+            "image/svg+xml"
+        );
+    }

-#[test]
-fn passing_audio_mpeg_2() {
-    assert_eq!(utils::detect_media_type(b"\xFF\x0E", ""), "audio/mpeg");
-}
+    #[test]
+    fn audio_mpeg() {
+        assert_eq!(utils::detect_media_type(b"ID3", ""), "audio/mpeg");
+    }

-#[test]
-fn passing_audio_mpeg_3() {
-    assert_eq!(utils::detect_media_type(b"\xFF\x0F", ""), "audio/mpeg");
-}
+    #[test]
+    fn audio_mpeg_2() {
+        assert_eq!(utils::detect_media_type(b"\xFF\x0E", ""), "audio/mpeg");
+    }

-#[test]
-fn passing_audio_ogg() {
-    assert_eq!(utils::detect_media_type(b"OggS", ""), "audio/ogg");
-}
+    #[test]
+    fn audio_mpeg_3() {
+        assert_eq!(utils::detect_media_type(b"\xFF\x0F", ""), "audio/mpeg");
+    }

-#[test]
-fn passing_audio_wav() {
-    assert_eq!(
-        utils::detect_media_type(b"RIFF....WAVEfmt ", ""),
-        "audio/wav"
-    );
-}
+    #[test]
+    fn audio_ogg() {
+        assert_eq!(utils::detect_media_type(b"OggS", ""), "audio/ogg");
+    }

-#[test]
-fn passing_audio_flac() {
-    assert_eq!(utils::detect_media_type(b"fLaC", ""), "audio/x-flac");
-}
+    #[test]
+    fn audio_wav() {
+        assert_eq!(
+            utils::detect_media_type(b"RIFF....WAVEfmt ", ""),
+            "audio/wav"
+        );
+    }

-#[test]
-fn passing_video_avi() {
-    assert_eq!(
-        utils::detect_media_type(b"RIFF....AVI LIST", ""),
-        "video/avi"
-    );
-}
+    #[test]
+    fn audio_flac() {
+        assert_eq!(utils::detect_media_type(b"fLaC", ""), "audio/x-flac");
+    }

-#[test]
-fn passing_video_mp4() {
-    assert_eq!(utils::detect_media_type(b"....ftyp", ""), "video/mp4");
-}
+    #[test]
+    fn video_avi() {
+        assert_eq!(
+            utils::detect_media_type(b"RIFF....AVI LIST", ""),
+            "video/avi"
+        );
+    }

-#[test]
-fn passing_video_mpeg() {
-    assert_eq!(
-        utils::detect_media_type(b"\x00\x00\x01\x0B", ""),
-        "video/mpeg"
-    );
-}
+    #[test]
+    fn video_mp4() {
+        assert_eq!(utils::detect_media_type(b"....ftyp", ""), "video/mp4");
+    }

-#[test]
-fn passing_video_quicktime() {
-    assert_eq!(utils::detect_media_type(b"....moov", ""), "video/quicktime");
-}
+    #[test]
+    fn video_mpeg() {
+        assert_eq!(
+            utils::detect_media_type(b"\x00\x00\x01\x0B", ""),
+            "video/mpeg"
+        );
+    }

-#[test]
-fn passing_video_webm() {
-    assert_eq!(
-        utils::detect_media_type(b"\x1A\x45\xDF\xA3", ""),
-        "video/webm"
-    );
+    #[test]
+    fn video_quicktime() {
+        assert_eq!(utils::detect_media_type(b"....moov", ""), "video/quicktime");
+    }
+
+    #[test]
+    fn video_webm() {
+        assert_eq!(
+            utils::detect_media_type(b"\x1A\x45\xDF\xA3", ""),
+            "video/webm"
+        );
+    }
 }

 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -141,7 +144,12 @@ fn passing_video_webm() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn failing_unknown_media_type() {
-    assert_eq!(utils::detect_media_type(b"abcdef0123456789", ""), "");
+#[cfg(test)]
+mod failing {
+    use crate::utils;
+
+    #[test]
+    fn unknown_media_type() {
+        assert_eq!(utils::detect_media_type(b"abcdef0123456789", ""), "");
+    }
 }
--- a/src/tests/utils/file_url_to_fs_path.rs
+++ b/src/tests/utils/file_url_to_fs_path.rs
@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,17 +5,37 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_remove_protocl_and_fragment() {
-    if cfg!(windows) {
-        assert_eq!(
-            utils::file_url_to_fs_path("file:///C:/documents/some-path/some-file.svg#fragment"),
-            "C:\\documents\\some-path\\some-file.svg"
-        );
-    } else {
-        assert_eq!(
-            utils::file_url_to_fs_path("file:///tmp/some-path/some-file.svg#fragment"),
-            "/tmp/some-path/some-file.svg"
-        );
+#[cfg(test)]
+mod passing {
+    use crate::utils;
+
+    #[test]
+    fn remove_protocl_and_fragment() {
+        if cfg!(windows) {
+            assert_eq!(
+                utils::file_url_to_fs_path("file:///C:/documents/some-path/some-file.svg#fragment"),
+                "C:\\documents\\some-path\\some-file.svg"
+            );
+        } else {
+            assert_eq!(
+                utils::file_url_to_fs_path("file:///tmp/some-path/some-file.svg#fragment"),
+                "/tmp/some-path/some-file.svg"
+            );
+        }
+    }
+
+    #[test]
+    fn decodes_urls() {
+        if cfg!(windows) {
+            assert_eq!(
+                utils::file_url_to_fs_path("file:///C:/Documents%20and%20Settings/some-file.html"),
+                "C:\\Documents and Settings\\some-file.html"
+            );
+        } else {
+            assert_eq!(
+                utils::file_url_to_fs_path("file:///home/user/My%20Documents"),
+                "/home/user/My Documents"
+            );
+        }
    }
 }
--- a/src/tests/utils/get_url_fragment.rs
+++ b/src/tests/utils/get_url_fragment.rs
@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,17 +5,22 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_data_url() {
-    assert_eq!(
-        utils::get_url_fragment(
-            "data:image/svg+xml;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h#test"
-        ),
-        "test"
-    );
-}
+#[cfg(test)]
+mod passing {
+    use crate::utils;

-#[test]
-fn passing_https_empty() {
-    assert_eq!(utils::get_url_fragment("https://kernel.org#"), "");
+    #[test]
+    fn data_url() {
+        assert_eq!(
+            utils::get_url_fragment(
+                "data:image/svg+xml;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h#test"
+            ),
+            "test"
+        );
+    }
+
+    #[test]
+    fn https_empty() {
+        assert_eq!(utils::get_url_fragment("https://kernel.org#"), "");
+    }
 }
--- a/src/tests/utils/is_data_url.rs
+++ b/src/tests/utils/is_data_url.rs
@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,18 +5,23 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_data_url_text_html() {
-    assert!(utils::is_data_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
-    ));
-}
+#[cfg(test)]
+mod passing {
+    use crate::utils;

-#[test]
-fn passing_data_url_no_media_type() {
-    assert!(utils::is_data_url(
-        "data:;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
-    ));
+    #[test]
+    fn data_url_text_html() {
+        assert!(utils::is_data_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
+        ));
+    }
+
+    #[test]
+    fn data_url_no_media_type() {
+        assert!(utils::is_data_url(
+            "data:;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
+        ));
+    }
 }

 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -28,17 +31,22 @@ fn passing_data_url_no_media_type() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn failing_https_url() {
-    assert!(!utils::is_data_url("https://kernel.org"));
-}
+#[cfg(test)]
+mod failing {
+    use crate::utils;

-#[test]
-fn failing_no_protocol_url() {
-    assert!(!utils::is_data_url("//kernel.org"));
-}
+    #[test]
+    fn https_url() {
+        assert!(!utils::is_data_url("https://kernel.org"));
+    }

-#[test]
-fn failing_empty_string() {
-    assert!(!utils::is_data_url(""));
+    #[test]
+    fn no_protocol_url() {
+        assert!(!utils::is_data_url("//kernel.org"));
+    }
+
+    #[test]
+    fn empty_string() {
+        assert!(!utils::is_data_url(""));
+    }
 }
--- a/src/tests/utils/is_file_url.rs
+++ b/src/tests/utils/is_file_url.rs
@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,32 +5,37 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_unix_file_url() {
-    assert!(utils::is_file_url(
-        "file:///home/user/Websites/my-website/index.html"
-    ));
-}
+#[cfg(test)]
+mod passing {
+    use crate::utils;

-#[test]
-fn passing_windows_file_url() {
-    assert!(utils::is_file_url(
-        "file:///C:/Documents%20and%20Settings/user/Websites/my-website/assets/images/logo.png"
-    ));
-}
+    #[test]
+    fn unix_file_url() {
+        assert!(utils::is_file_url(
+            "file:///home/user/Websites/my-website/index.html"
+        ));
+    }

-#[test]
-fn passing_unix_url_with_backslashes() {
-    assert!(utils::is_file_url(
-        "file:\\\\\\home\\user\\Websites\\my-website\\index.html"
-    ));
-}
+    #[test]
+    fn windows_file_url() {
+        assert!(utils::is_file_url(
+            "file:///C:/Documents%20and%20Settings/user/Websites/my-website/assets/images/logo.png"
+        ));
+    }

-#[test]
-fn passing_windows_file_url_with_backslashes() {
-    assert!(utils::is_file_url(
-        "file:\\\\\\C:\\Documents%20and%20Settings\\user\\Websites\\my-website\\assets\\images\\logo.png"
-    ));
+    #[test]
+    fn unix_url_with_backslashes() {
+        assert!(utils::is_file_url(
+            "file:\\\\\\home\\user\\Websites\\my-website\\index.html"
+        ));
+    }
+
+    #[test]
+    fn windows_file_url_with_backslashes() {
+        assert!(utils::is_file_url(
+            "file:\\\\\\C:\\Documents%20and%20Settings\\user\\Websites\\my-website\\assets\\images\\logo.png"
+        ));
+    }
 }

 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -42,34 +45,39 @@ fn passing_windows_file_url_with_backslashes() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn failing_url_with_no_protocl() {
-    assert!(!utils::is_file_url("//kernel.org"));
-}
+#[cfg(test)]
+mod failing {
+    use crate::utils;

-#[test]
-fn failing_dot_slash_filename() {
-    assert!(!utils::is_file_url("./index.html"));
-}
+    #[test]
+    fn url_with_no_protocl() {
+        assert!(!utils::is_file_url("//kernel.org"));
+    }

-#[test]
-fn failing_just_filename() {
-    assert!(!utils::is_file_url("some-local-page.htm"));
-}
+    #[test]
+    fn dot_slash_filename() {
+        assert!(!utils::is_file_url("./index.html"));
+    }

-#[test]
-fn failing_https_ip_port_url() {
-    assert!(!utils::is_file_url("https://1.2.3.4:80/www/index.html"));
-}
+    #[test]
+    fn just_filename() {
+        assert!(!utils::is_file_url("some-local-page.htm"));
+    }

-#[test]
-fn failing_data_url() {
-    assert!(!utils::is_file_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
-    ));
-}
+    #[test]
+    fn https_ip_port_url() {
+        assert!(!utils::is_file_url("https://1.2.3.4:80/www/index.html"));
+    }

-#[test]
-fn failing_just_word_file() {
-    assert!(!utils::is_file_url("file"));
+    #[test]
+    fn data_url() {
+        assert!(!utils::is_file_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
+        ));
+    }
+
+    #[test]
+    fn just_word_file() {
+        assert!(!utils::is_file_url("file"));
+    }
 }
--- a/src/tests/utils/is_http_url.rs
+++ b/src/tests/utils/is_http_url.rs
@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,19 +5,24 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_http_url() {
-    assert!(utils::is_http_url("http://kernel.org"));
-}
+#[cfg(test)]
+mod passing {
+    use crate::utils;

-#[test]
-fn passing_https_url() {
-    assert!(utils::is_http_url("https://www.rust-lang.org/"));
-}
+    #[test]
+    fn http_url() {
+        assert!(utils::is_http_url("http://kernel.org"));
+    }

-#[test]
-fn passing_http_url_with_backslashes() {
-    assert!(utils::is_http_url("http:\\\\freebsd.org\\"));
+    #[test]
+    fn https_url() {
+        assert!(utils::is_http_url("https://www.rust-lang.org/"));
+    }
+
+    #[test]
+    fn http_url_with_backslashes() {
+        assert!(utils::is_http_url("http:\\\\freebsd.org\\"));
+    }
 }

 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -29,29 +32,34 @@ fn passing_http_url_with_backslashes() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn failing_url_with_no_protocol() {
-    assert!(!utils::is_http_url("//kernel.org"));
-}
+#[cfg(test)]
+mod failing {
+    use crate::utils;

-#[test]
-fn failing_dot_slash_filename() {
-    assert!(!utils::is_http_url("./index.html"));
-}
+    #[test]
+    fn url_with_no_protocol() {
+        assert!(!utils::is_http_url("//kernel.org"));
+    }

-#[test]
-fn failing_just_filename() {
-    assert!(!utils::is_http_url("some-local-page.htm"));
-}
+    #[test]
+    fn dot_slash_filename() {
+        assert!(!utils::is_http_url("./index.html"));
+    }

-#[test]
-fn failing_https_ip_port_url() {
-    assert!(!utils::is_http_url("ftp://1.2.3.4/www/index.html"));
-}
+    #[test]
+    fn just_filename() {
+        assert!(!utils::is_http_url("some-local-page.htm"));
+    }

-#[test]
-fn failing_data_url() {
-    assert!(!utils::is_http_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
-    ));
+    #[test]
+    fn https_ip_port_url() {
+        assert!(!utils::is_http_url("ftp://1.2.3.4/www/index.html"));
+    }
+
+    #[test]
+    fn data_url() {
+        assert!(!utils::is_http_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h"
+        ));
+    }
 }
--- a/src/tests/utils/mod.rs
+++ b/src/tests/utils/mod.rs
@@ -1,6 +1,6 @@
 mod clean_url;
 mod data_to_data_url;
-mod data_url_to_text;
+mod data_url_to_data;
 mod decode_url;
 mod detect_media_type;
 mod file_url_to_fs_path;
--- a/src/tests/utils/resolve_url.rs
+++ b/src/tests/utils/resolve_url.rs
@@ -1,7 +1,3 @@
-use url::ParseError;
-
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -9,203 +5,210 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_from_https_to_level_up_relative() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url("https://www.kernel.org", "../category/signatures.html")?;
+#[cfg(test)]
+mod passing {
+    use crate::utils;
+    use url::ParseError;

-    assert_eq!(
-        resolved_url.as_str(),
-        "https://www.kernel.org/category/signatures.html"
-    );
+    #[test]
+    fn from_https_to_level_up_relative() -> Result<(), ParseError> {
+        let resolved_url =
+            utils::resolve_url("https://www.kernel.org", "../category/signatures.html")?;

-    Ok(())
-}
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://www.kernel.org/category/signatures.html"
+        );

-#[test]
-fn passing_from_just_filename_to_full_https_url() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "saved_page.htm",
-        "https://www.kernel.org/category/signatures.html",
-    )?;
+        Ok(())
+    }

-    assert_eq!(
-        resolved_url.as_str(),
-        "https://www.kernel.org/category/signatures.html"
-    );
+    #[test]
+    fn from_just_filename_to_full_https_url() -> Result<(), ParseError> {
+        let resolved_url = utils::resolve_url(
+            "saved_page.htm",
+            "https://www.kernel.org/category/signatures.html",
+        )?;

-    Ok(())
-}
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://www.kernel.org/category/signatures.html"
+        );

-#[test]
-fn passing_from_https_url_to_url_with_no_protocol() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "https://www.kernel.org",
-        "//www.kernel.org/theme/images/logos/tux.png",
-    )?;
+        Ok(())
+    }

-    assert_eq!(
-        resolved_url.as_str(),
-        "https://www.kernel.org/theme/images/logos/tux.png"
-    );
+    #[test]
+    fn from_https_url_to_url_with_no_protocol() -> Result<(), ParseError> {
+        let resolved_url = utils::resolve_url(
+            "https://www.kernel.org",
+            "//www.kernel.org/theme/images/logos/tux.png",
+        )?;

-    Ok(())
-}
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://www.kernel.org/theme/images/logos/tux.png"
+        );

-#[test]
-fn passing_from_https_url_to_url_with_no_protocol_and_on_different_hostname(
-) -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "https://www.kernel.org",
-        "//another-host.org/theme/images/logos/tux.png",
-    )?;
+        Ok(())
+    }

-    assert_eq!(
-        resolved_url.as_str(),
-        "https://another-host.org/theme/images/logos/tux.png"
-    );
+    #[test]
+    fn from_https_url_to_url_with_no_protocol_and_on_different_hostname() -> Result<(), ParseError>
+    {
+        let resolved_url = utils::resolve_url(
+            "https://www.kernel.org",
+            "//another-host.org/theme/images/logos/tux.png",
+        )?;

-    Ok(())
-}
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://another-host.org/theme/images/logos/tux.png"
+        );

-#[test]
-fn passing_from_https_url_to_relative_root_path() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "https://www.kernel.org/category/signatures.html",
-        "/theme/images/logos/tux.png",
-    )?;
+        Ok(())
+    }

-    assert_eq!(
-        resolved_url.as_str(),
-        "https://www.kernel.org/theme/images/logos/tux.png"
-    );
+    #[test]
+    fn from_https_url_to_relative_root_path() -> Result<(), ParseError> {
+        let resolved_url = utils::resolve_url(
+            "https://www.kernel.org/category/signatures.html",
+            "/theme/images/logos/tux.png",
+        )?;

-    Ok(())
-}
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://www.kernel.org/theme/images/logos/tux.png"
+        );

-#[test]
-fn passing_from_https_to_just_filename() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "https://www.w3schools.com/html/html_iframe.asp",
-        "default.asp",
-    )?;
+        Ok(())
+    }

-    assert_eq!(
-        resolved_url.as_str(),
-        "https://www.w3schools.com/html/default.asp"
-    );
+    #[test]
+    fn from_https_to_just_filename() -> Result<(), ParseError> {
+        let resolved_url = utils::resolve_url(
+            "https://www.w3schools.com/html/html_iframe.asp",
+            "default.asp",
+        )?;

-    Ok(())
-}
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://www.w3schools.com/html/default.asp"
+        );

-#[test]
-fn passing_from_data_url_to_https() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
-        "https://www.kernel.org/category/signatures.html",
-    )?;
+        Ok(())
+    }

-    assert_eq!(
-        resolved_url.as_str(),
-        "https://www.kernel.org/category/signatures.html"
-    );
+    #[test]
+    fn from_data_url_to_https() -> Result<(), ParseError> {
+        let resolved_url = utils::resolve_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
+            "https://www.kernel.org/category/signatures.html",
+        )?;

-    Ok(())
-}
+        assert_eq!(
+            resolved_url.as_str(),
+            "https://www.kernel.org/category/signatures.html"
+        );

-#[test]
-fn passing_from_data_url_to_data_url() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
-        "data:text/html;base64,PGEgaHJlZj0iaW5kZXguaHRtbCI+SG9tZTwvYT4K",
-    )?;
+        Ok(())
+    }

-    assert_eq!(
-        resolved_url.as_str(),
-        "data:text/html;base64,PGEgaHJlZj0iaW5kZXguaHRtbCI+SG9tZTwvYT4K"
-    );
+    #[test]
+    fn from_data_url_to_data_url() -> Result<(), ParseError> {
+        let resolved_url = utils::resolve_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
+            "data:text/html;base64,PGEgaHJlZj0iaW5kZXguaHRtbCI+SG9tZTwvYT4K",
+        )?;

-    Ok(())
-}
+        assert_eq!(
+            resolved_url.as_str(),
+            "data:text/html;base64,PGEgaHJlZj0iaW5kZXguaHRtbCI+SG9tZTwvYT4K"
+        );

-#[test]
-fn passing_from_file_url_to_relative_path() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "file:///home/user/Websites/my-website/index.html",
-        "assets/images/logo.png",
-    )
-    .unwrap_or(str!());
+        Ok(())
+    }

-    assert_eq!(
-        resolved_url.as_str(),
-        "file:///home/user/Websites/my-website/assets/images/logo.png"
-    );
+    #[test]
+    fn from_file_url_to_relative_path() -> Result<(), ParseError> {
+        let resolved_url = utils::resolve_url(
+            "file:///home/user/Websites/my-website/index.html",
+            "assets/images/logo.png",
+        )
+        .unwrap_or(str!());

-    Ok(())
-}
+        assert_eq!(
+            resolved_url.as_str(),
+            "file:///home/user/Websites/my-website/assets/images/logo.png"
+        );

-#[test]
-fn passing_from_file_url_to_relative_path_with_backslashes() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "file:\\\\\\home\\user\\Websites\\my-website\\index.html",
-        "assets\\images\\logo.png",
-    )
-    .unwrap_or(str!());
+        Ok(())
+    }

-    assert_eq!(
-        resolved_url.as_str(),
-        "file:///home/user/Websites/my-website/assets/images/logo.png"
-    );
+    #[test]
+    fn from_file_url_to_relative_path_with_backslashes() -> Result<(), ParseError> {
+        let resolved_url = utils::resolve_url(
+            "file:\\\\\\home\\user\\Websites\\my-website\\index.html",
+            "assets\\images\\logo.png",
+        )
+        .unwrap_or(str!());

-    Ok(())
-}
+        assert_eq!(
+            resolved_url.as_str(),
+            "file:///home/user/Websites/my-website/assets/images/logo.png"
+        );

-#[test]
-fn passing_from_data_url_to_file_url() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
-        "file:///etc/passwd",
-    )
-    .unwrap_or(str!());
+        Ok(())
+    }

-    assert_eq!(resolved_url.as_str(), "file:///etc/passwd");
+    #[test]
+    fn from_data_url_to_file_url() -> Result<(), ParseError> {
+        let resolved_url = utils::resolve_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
+            "file:///etc/passwd",
+        )
+        .unwrap_or(str!());

-    Ok(())
-}
+        assert_eq!(resolved_url.as_str(), "file:///etc/passwd");

-#[test]
-fn passing_preserve_fragment() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "http://doesnt-matter.local/",
-        "css/fonts/fontmarvelous.svg#fontmarvelous",
-    )
-    .unwrap_or(str!());
+        Ok(())
+    }

-    assert_eq!(
-        resolved_url.as_str(),
-        "http://doesnt-matter.local/css/fonts/fontmarvelous.svg#fontmarvelous"
-    );
+    #[test]
+    fn preserve_fragment() -> Result<(), ParseError> {
+        let resolved_url = utils::resolve_url(
+            "http://doesnt-matter.local/",
+            "css/fonts/fontmarvelous.svg#fontmarvelous",
+        )
+        .unwrap_or(str!());

-    Ok(())
-}
+        assert_eq!(
+            resolved_url.as_str(),
+            "http://doesnt-matter.local/css/fonts/fontmarvelous.svg#fontmarvelous"
+        );

-#[test]
-fn passing_resolve_from_file_url_to_file_url() -> Result<(), ParseError> {
-    let resolved_url = if cfg!(windows) {
-        utils::resolve_url("file:///c:/index.html", "file:///c:/image.png").unwrap_or(str!())
-    } else {
-        utils::resolve_url("file:///tmp/index.html", "file:///tmp/image.png").unwrap_or(str!())
-    };
+        Ok(())
+    }

-    assert_eq!(
-        resolved_url.as_str(),
-        if cfg!(windows) {
-            "file:///c:/image.png"
+    #[test]
+    fn resolve_from_file_url_to_file_url() -> Result<(), ParseError> {
+        let resolved_url = if cfg!(windows) {
+            utils::resolve_url("file:///c:/index.html", "file:///c:/image.png").unwrap_or(str!())
        } else {
-            "file:///tmp/image.png"
-        }
-    );
+            utils::resolve_url("file:///tmp/index.html", "file:///tmp/image.png").unwrap_or(str!())
+        };

-    Ok(())
+        assert_eq!(
+            resolved_url.as_str(),
+            if cfg!(windows) {
+                "file:///c:/image.png"
+            } else {
+                "file:///tmp/image.png"
+            }
+        );
+
+        Ok(())
+    }
 }

 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -215,15 +218,21 @@ fn passing_resolve_from_file_url_to_file_url() -> Result<(), ParseError> {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn failing_from_data_url_to_url_with_no_protocol() -> Result<(), ParseError> {
-    let resolved_url = utils::resolve_url(
-        "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
-        "//www.w3schools.com/html/html_iframe.asp",
-    )
-    .unwrap_or(str!());
+#[cfg(test)]
+mod failing {
+    use crate::utils;
+    use url::ParseError;

-    assert_eq!(resolved_url.as_str(), "");
+    #[test]
+    fn from_data_url_to_url_with_no_protocol() -> Result<(), ParseError> {
+        let resolved_url = utils::resolve_url(
+            "data:text/html;base64,V2VsY29tZSBUbyBUaGUgUGFydHksIDxiPlBhbDwvYj4h",
+            "//www.w3schools.com/html/html_iframe.asp",
+        )
+        .unwrap_or(str!());

-    Ok(())
+        assert_eq!(resolved_url.as_str(), "");
+
+        Ok(())
+    }
 }
--- a/src/tests/utils/retrieve_asset.rs
+++ b/src/tests/utils/retrieve_asset.rs
@@ -1,8 +1,3 @@
-use crate::utils;
-use reqwest::blocking::Client;
-use std::collections::HashMap;
-use std::env;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -10,83 +5,74 @@ use std::env;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_read_data_url() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
+#[cfg(test)]
+mod passing {
+    use crate::utils;
+    use reqwest::blocking::Client;
+    use std::collections::HashMap;
+    use std::env;

-    // If both source and target are data URLs,
-    // ensure the result contains target data URL
-    let (retrieved_data, final_url) = utils::retrieve_asset(
-        cache,
-        &client,
-        "data:text/html;base64,SoUrCe",
-        "data:text/html;base64,TaRgEt",
-        true,
-        "",
-        false,
-    )
-    .unwrap();
-    assert_eq!(&retrieved_data, "data:text/html;base64,TaRgEt");
-    assert_eq!(&final_url, "data:text/html;base64,TaRgEt");
-}
+    #[test]
+    fn read_data_url() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();

-#[test]
-fn passing_read_data_url_ignore_suggested_media_type() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    // Media type parameter should not influence data URLs
-    let (data, final_url) = utils::retrieve_asset(
-        cache,
-        &client,
-        "data:text/html;base64,SoUrCe",
-        "data:text/html;base64,TaRgEt",
-        true,
-        "image/png",
-        false,
-    )
-    .unwrap();
-    assert_eq!(&data, "data:text/html;base64,TaRgEt");
-    assert_eq!(&final_url, "data:text/html;base64,TaRgEt");
-}
-
-#[test]
-fn passing_read_local_file_with_file_url_parent() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
-
-    // Inclusion of local assets from local sources should be allowed
-    let cwd = env::current_dir().unwrap();
-    let (data, final_url) = utils::retrieve_asset(
-        cache,
-        &client,
-        &format!(
-            "{file}{cwd}/src/tests/data/local-file.html",
-            file = file_url_protocol,
-            cwd = cwd.to_str().unwrap()
-        ),
-        &format!(
-            "{file}{cwd}/src/tests/data/local-script.js",
-            file = file_url_protocol,
-            cwd = cwd.to_str().unwrap()
-        ),
-        true,
-        "application/javascript",
-        false,
-    )
-    .unwrap();
-    assert_eq!(&data, "data:application/javascript;base64,ZG9jdW1lbnQuYm9keS5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiZ3JlZW4iOwpkb2N1bWVudC5ib2R5LnN0eWxlLmNvbG9yID0gInJlZCI7Cg==");
-    assert_eq!(
-        &final_url,
-        &format!(
-            "{file}{cwd}/src/tests/data/local-script.js",
-            file = file_url_protocol,
-            cwd = cwd.to_str().unwrap()
+        // If both source and target are data URLs,
+        // ensure the result contains target data URL
+        let (data, final_url, media_type) = utils::retrieve_asset(
+            cache,
+            &client,
+            "data:text/html;base64,c291cmNl",
+            "data:text/html;base64,dGFyZ2V0",
+            false,
        )
-    );
+        .unwrap();
+        assert_eq!(
+            utils::data_to_data_url(&media_type, &data, &final_url, ""),
+            utils::data_to_data_url("text/html", "target".as_bytes(), "", "")
+        );
+        assert_eq!(
+            final_url,
+            utils::data_to_data_url("text/html", "target".as_bytes(), "", "")
+        );
+        assert_eq!(&media_type, "text/html");
+    }
+
+    #[test]
+    fn read_local_file_with_file_url_parent() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        let file_url_protocol: &str = if cfg!(windows) { "file:///" } else { "file://" };
+
+        // Inclusion of local assets from local sources should be allowed
+        let cwd = env::current_dir().unwrap();
+        let (data, final_url, _media_type) = utils::retrieve_asset(
+            cache,
+            &client,
+            &format!(
+                "{file}{cwd}/src/tests/data/basic/local-file.html",
+                file = file_url_protocol,
+                cwd = cwd.to_str().unwrap()
+            ),
+            &format!(
+                "{file}{cwd}/src/tests/data/basic/local-script.js",
+                file = file_url_protocol,
+                cwd = cwd.to_str().unwrap()
+            ),
+            false,
+        )
+        .unwrap();
+        assert_eq!(utils::data_to_data_url("application/javascript", &data, &final_url, ""), "data:application/javascript;base64,ZG9jdW1lbnQuYm9keS5zdHlsZS5iYWNrZ3JvdW5kQ29sb3IgPSAiZ3JlZW4iOwpkb2N1bWVudC5ib2R5LnN0eWxlLmNvbG9yID0gInJlZCI7Cg==");
+        assert_eq!(
+            &final_url,
+            &format!(
+                "{file}{cwd}/src/tests/data/basic/local-script.js",
+                file = file_url_protocol,
+                cwd = cwd.to_str().unwrap()
+            )
+        );
+    }
 }

 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -96,42 +82,53 @@ fn passing_read_local_file_with_file_url_parent() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn failing_read_local_file_with_data_url_parent() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
+#[cfg(test)]
+mod failing {
+    use crate::utils;
+    use reqwest::blocking::Client;
+    use std::collections::HashMap;

-    // Inclusion of local assets from data URL sources should not be allowed
-    let (data, final_url) = utils::retrieve_asset(
-        cache,
-        &client,
-        "data:text/html;base64,SoUrCe",
-        "file:///etc/passwd",
-        true,
-        "",
-        false,
-    )
-    .unwrap();
-    assert_eq!(&data, "");
-    assert_eq!(&final_url, "");
-}
-
-#[test]
-fn failing_read_local_file_with_https_parent() {
-    let cache = &mut HashMap::new();
-    let client = Client::new();
-
-    // Inclusion of local assets from remote sources should not be allowed
-    let (data, final_url) = utils::retrieve_asset(
-        cache,
-        &client,
-        "https://kernel.org/",
-        "file:///etc/passwd",
-        true,
-        "",
-        false,
-    )
-    .unwrap();
-    assert_eq!(&data, "");
-    assert_eq!(&final_url, "");
+    #[test]
+    fn read_local_file_with_data_url_parent() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        // Inclusion of local assets from data URL sources should not be allowed
+        match utils::retrieve_asset(
+            cache,
+            &client,
+            "data:text/html;base64,SoUrCe",
+            "file:///etc/passwd",
+            false,
+        ) {
+            Ok((..)) => {
+                assert!(false);
+            }
+            Err(_) => {
+                assert!(true);
+            }
+        }
+    }
+
+    #[test]
+    fn read_local_file_with_https_parent() {
+        let cache = &mut HashMap::new();
+        let client = Client::new();
+
+        // Inclusion of local assets from remote sources should not be allowed
+        match utils::retrieve_asset(
+            cache,
+            &client,
+            "https://kernel.org/",
+            "file:///etc/passwd",
+            false,
+        ) {
+            Ok((..)) => {
+                assert!(false);
+            }
+            Err(_) => {
+                assert!(true);
+            }
+        }
+    }
 }
--- a/src/tests/utils/url_has_protocol.rs
+++ b/src/tests/utils/url_has_protocol.rs
@@ -1,5 +1,3 @@
-use crate::utils;
-
 //  ██████╗  █████╗ ███████╗███████╗██╗███╗   ██╗ ██████╗
 //  ██╔══██╗██╔══██╗██╔════╝██╔════╝██║████╗  ██║██╔════╝
 //  ██████╔╝███████║███████╗███████╗██║██╔██╗ ██║██║  ███╗
@@ -7,50 +5,55 @@ use crate::utils;
 //  ██║     ██║  ██║███████║███████║██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚══════╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn passing_mailto() {
-    assert!(utils::url_has_protocol(
-        "mailto:somebody@somewhere.com?subject=hello"
-    ));
-}
+#[cfg(test)]
+mod passing {
+    use crate::utils;

-#[test]
-fn passing_tel() {
-    assert!(utils::url_has_protocol("tel:5551234567"));
-}
+    #[test]
+    fn mailto() {
+        assert!(utils::url_has_protocol(
+            "mailto:somebody@somewhere.com?subject=hello"
+        ));
+    }

-#[test]
-fn passing_ftp_no_slashes() {
-    assert!(utils::url_has_protocol("ftp:some-ftp-server.com"));
-}
+    #[test]
+    fn tel() {
+        assert!(utils::url_has_protocol("tel:5551234567"));
+    }

-#[test]
-fn passing_ftp_with_credentials() {
-    assert!(utils::url_has_protocol(
-        "ftp://user:password@some-ftp-server.com"
-    ));
-}
+    #[test]
+    fn ftp_no_slashes() {
+        assert!(utils::url_has_protocol("ftp:some-ftp-server.com"));
+    }

-#[test]
-fn passing_javascript() {
-    assert!(utils::url_has_protocol("javascript:void(0)"));
-}
+    #[test]
+    fn ftp_with_credentials() {
+        assert!(utils::url_has_protocol(
+            "ftp://user:password@some-ftp-server.com"
+        ));
+    }

-#[test]
-fn passing_http() {
-    assert!(utils::url_has_protocol("http://news.ycombinator.com"));
-}
+    #[test]
+    fn javascript() {
+        assert!(utils::url_has_protocol("javascript:void(0)"));
+    }

-#[test]
-fn passing_https() {
-    assert!(utils::url_has_protocol("https://github.com"));
-}
+    #[test]
+    fn http() {
+        assert!(utils::url_has_protocol("http://news.ycombinator.com"));
+    }

-#[test]
-fn passing_mailto_uppercase() {
-    assert!(utils::url_has_protocol(
-        "MAILTO:somebody@somewhere.com?subject=hello"
-    ));
+    #[test]
+    fn https() {
+        assert!(utils::url_has_protocol("https://github.com"));
+    }
+
+    #[test]
+    fn mailto_uppercase() {
+        assert!(utils::url_has_protocol(
+            "MAILTO:somebody@somewhere.com?subject=hello"
+        ));
+    }
 }

 //  ███████╗ █████╗ ██╗██╗     ██╗███╗   ██╗ ██████╗
@@ -60,24 +63,29 @@ fn passing_mailto_uppercase() {
 //  ██║     ██║  ██║██║███████╗██║██║ ╚████║╚██████╔╝
 //  ╚═╝     ╚═╝  ╚═╝╚═╝╚══════╝╚═╝╚═╝  ╚═══╝ ╚═════╝

-#[test]
-fn failing_url_with_no_protocol() {
-    assert!(!utils::url_has_protocol(
-        "//some-hostname.com/some-file.html"
-    ));
-}
+#[cfg(test)]
+mod failing {
+    use crate::utils;

-#[test]
-fn failing_relative_path() {
-    assert!(!utils::url_has_protocol("some-hostname.com/some-file.html"));
-}
+    #[test]
+    fn url_with_no_protocol() {
+        assert!(!utils::url_has_protocol(
+            "//some-hostname.com/some-file.html"
+        ));
+    }

-#[test]
-fn failing_relative_to_root_path() {
-    assert!(!utils::url_has_protocol("/some-file.html"));
-}
+    #[test]
+    fn relative_path() {
+        assert!(!utils::url_has_protocol("some-hostname.com/some-file.html"));
+    }

-#[test]
-fn failing_empty_string() {
-    assert!(!utils::url_has_protocol(""));
+    #[test]
+    fn relative_to_root_path() {
+        assert!(!utils::url_has_protocol("/some-file.html"));
+    }
+
+    #[test]
+    fn empty_string() {
+        assert!(!utils::url_has_protocol(""));
+    }
 }
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -30,6 +30,14 @@ const MAGIC: [[&[u8]; 2]; 18] = [
    [b"\x1A\x45\xDF\xA3", b"video/webm"],
 ];

+const PLAINTEXT_MEDIA_TYPES: &[&str] = &[
+    "image/svg+xml",
+    "text/css",
+    "text/html",
+    "text/javascript",
+    "text/plain",
+];
+
 pub fn data_to_data_url(media_type: &str, data: &[u8], url: &str, fragment: &str) -> String {
    let media_type: String = if media_type.is_empty() {
        detect_media_type(data, &url)
@@ -88,6 +96,10 @@ pub fn is_http_url<T: AsRef<str>>(url: T) -> bool {
        .unwrap_or(false)
 }

+pub fn is_plaintext_media_type(media_type: &str) -> bool {
+    PLAINTEXT_MEDIA_TYPES.contains(&media_type.to_lowercase().as_str())
+}
+
 pub fn resolve_url<T: AsRef<str>, U: AsRef<str>>(from: T, to: U) -> Result<String, ParseError> {
    let result = if is_http_url(to.as_ref()) {
        to.as_ref().to_string()
@@ -108,65 +120,68 @@ pub fn get_url_fragment<T: AsRef<str>>(url: T) -> String {
    }
 }

-pub fn clean_url<T: AsRef<str>>(url: T) -> String {
-    let mut result = Url::parse(url.as_ref()).unwrap();
+pub fn clean_url<T: AsRef<str>>(input: T) -> String {
+    let mut url = Url::parse(input.as_ref()).unwrap();

    // Clear fragment
-    result.set_fragment(None);
+    url.set_fragment(None);

    // Get rid of stray question mark
-    if result.query() == Some("") {
-        result.set_query(None);
+    if url.query() == Some("") {
+        url.set_query(None);
    }
-    result.to_string()
+
+    // Remove empty trailing ampersand(s)
+    let mut result: String = url.to_string();
+    while result.ends_with("&") {
+        result.pop();
+    }
+
+    result
 }

-pub fn data_url_to_text<T: AsRef<str>>(url: T) -> String {
-    let parsed_url = Url::parse(url.as_ref()).unwrap_or(Url::parse("http://[::1]").unwrap());
+pub fn data_url_to_data<T: AsRef<str>>(url: T) -> (String, Vec<u8>) {
+    let parsed_url: Url = Url::parse(url.as_ref()).unwrap_or(Url::parse("data:,").unwrap());
    let path: String = parsed_url.path().to_string();
    let comma_loc: usize = path.find(',').unwrap_or(path.len());

-    if comma_loc == path.len() {
-        return str!();
-    }
-
    let meta_data: String = path.chars().take(comma_loc).collect();
    let raw_data: String = path.chars().skip(comma_loc + 1).collect();

-    let data: String = decode_url(raw_data);
+    let text: String = decode_url(raw_data);

    let meta_data_items: Vec<&str> = meta_data.split(';').collect();
-    let mut media_type: &str = "";
+    let mut media_type: String = str!();
    let mut encoding: &str = "";

    let mut i: i8 = 0;
    for item in &meta_data_items {
        if i == 0 {
-            if item.eq_ignore_ascii_case("text/html") {
-                media_type = item;
-                continue;
+            media_type = str!(item);
+        } else {
+            if item.eq_ignore_ascii_case("base64")
+                || item.eq_ignore_ascii_case("utf8")
+                || item.eq_ignore_ascii_case("charset=UTF-8")
+            {
+                encoding = item;
            }
        }

-        if item.eq_ignore_ascii_case("base64") || item.eq_ignore_ascii_case("utf8") {
-            encoding = item;
-        }
-
        i = i + 1;
    }

-    if media_type.eq_ignore_ascii_case("text/html") {
-        if encoding.eq_ignore_ascii_case("base64") {
-            String::from_utf8(base64::decode(&data).unwrap_or(vec![])).unwrap_or(str!())
-        } else {
-            data
-        }
+    let data: Vec<u8> = if encoding.eq_ignore_ascii_case("base64") {
+        base64::decode(&text).unwrap_or(vec![])
    } else {
-        str!()
-    }
+        text.as_bytes().to_vec()
+    };
+
+    (media_type, data)
 }

 pub fn decode_url(input: String) -> String {
+    let input: String = input.replace("+", "%2B");
+
    form_urlencoded::parse(input.as_bytes())
        .map(|(key, val)| {
            [
@@ -200,66 +215,61 @@ pub fn file_url_to_fs_path(url: &str) -> String {
        fs_file_path = fs_file_path.replace("/", "\\");
    }

-    fs_file_path
+    // File paths should not be %-encoded
+    decode_url(fs_file_path)
 }

 pub fn retrieve_asset(
-    cache: &mut HashMap<String, String>,
+    cache: &mut HashMap<String, Vec<u8>>,
    client: &Client,
    parent_url: &str,
    url: &str,
-    as_data_url: bool,
-    media_type: &str,
    opt_silent: bool,
-) -> Result<(String, String), reqwest::Error> {
+) -> Result<(Vec<u8>, String, String), reqwest::Error> {
    if url.len() == 0 {
-        return Ok((str!(), str!()));
+        // Provoke error
+        client.get("").send()?;
    }

-    let cache_key = clean_url(&url);
-
    if is_data_url(&url) {
-        Ok((url.to_string(), url.to_string()))
+        let (media_type, data) = data_url_to_data(url);
+        Ok((data, url.to_string(), media_type))
    } else if is_file_url(&url) {
        // Check if parent_url is also file:///
        // (if not, then we don't embed the asset)
        if !is_file_url(&parent_url) {
-            return Ok((str!(), str!()));
+            // Provoke error
+            client.get("").send()?;
        }

        let fs_file_path: String = file_url_to_fs_path(url);
        let path = Path::new(&fs_file_path);
-        let url_fragment = get_url_fragment(url);
        if path.exists() {
            if !opt_silent {
                eprintln!("{}", &url);
            }

-            if as_data_url {
-                let data_url: String = data_to_data_url(
-                    &media_type,
-                    &fs::read(&fs_file_path).unwrap(),
-                    &fs_file_path,
-                    &url_fragment,
-                );
-                Ok((data_url, url.to_string()))
-            } else {
-                let data: String = fs::read_to_string(&fs_file_path).expect(url);
-                Ok((data, url.to_string()))
-            }
+            Ok((fs::read(&fs_file_path).expect(""), url.to_string(), str!()))
        } else {
-            Ok((str!(), url.to_string()))
+            // Provoke error
+            Err(client.get("").send().unwrap_err())
        }
    } else {
+        let cache_key: String = clean_url(&url);
+
        if cache.contains_key(&cache_key) {
-            // URL is in cache
+            // URL is in cache, we get and return it
            if !opt_silent {
                eprintln!("{} (from cache)", &url);
            }
-            let data = cache.get(&cache_key).unwrap();
-            Ok((data.to_string(), url.to_string()))
+
+            Ok((
+                cache.get(&cache_key).unwrap().to_vec(),
+                url.to_string(),
+                str!(),
+            ))
        } else {
-            // URL not in cache, we request it
+            // URL not in cache, we retrieve the file
            let mut response = client.get(url).send()?;
            let res_url = response.url().to_string();

@@ -271,34 +281,23 @@ pub fn retrieve_asset(
                }
            }

-            let new_cache_key = clean_url(&res_url);
+            let new_cache_key: String = clean_url(&res_url);

-            if as_data_url {
-                // Convert response into a byte array
-                let mut data: Vec<u8> = vec![];
-                response.copy_to(&mut data)?;
+            // Convert response into a byte array
+            let mut data: Vec<u8> = vec![];
+            response.copy_to(&mut data)?;

-                // Attempt to obtain media type by reading the Content-Type header
-                let media_type = if media_type == "" {
-                    response
-                        .headers()
-                        .get(CONTENT_TYPE)
-                        .and_then(|header| header.to_str().ok())
-                        .unwrap_or(&media_type)
-                } else {
-                    media_type
-                };
-                let url_fragment = get_url_fragment(url);
-                let data_url = data_to_data_url(&media_type, &data, url, &url_fragment);
-                // Add to cache
-                cache.insert(new_cache_key, data_url.clone());
-                Ok((data_url, res_url))
-            } else {
-                let content = response.text().unwrap();
-                // Add to cache
-                cache.insert(new_cache_key, content.clone());
-                Ok((content, res_url))
-            }
+            // Attempt to obtain media type by reading the Content-Type header
+            let media_type = response
+                .headers()
+                .get(CONTENT_TYPE)
+                .and_then(|header| header.to_str().ok())
+                .unwrap_or("");
+
+            // Add to cache
+            cache.insert(new_cache_key, data.clone());
+
+            Ok((data, res_url, media_type.to_string()))
        }
    }
 }
Author	SHA1	Message	Date
Sunshine	9894213393	Merge pull request #182 from snshn/version-bump Version bump	2020-06-01 05:48:08 -04:00
Sunshine	80523c5a59	version bump	2020-06-01 05:41:42 -04:00
Sunshine	65b5ff4ec0	Merge pull request #181 from snshn/only-remove-credentals-from-http-urls Only attempt to remove credentals from HTTP(S) URLs	2020-06-01 05:36:01 -04:00
Sunshine	4e31d0433e	only attempt to remove credentals from HTTP(S) URLs	2020-06-01 05:28:02 -04:00
Sunshine	ed82b96152	Merge pull request #179 from snshn/refine-adrs Refine ADRs	2020-05-25 00:41:38 -04:00
Sunshine	f16a2a9ed5	refine ADRs	2020-05-24 21:21:52 -04:00
Sunshine	38d7873d6e	Update 0004-asset-integrity-check.md	2020-05-24 21:10:35 -04:00
Sunshine	d848179a43	Merge pull request #124 from snshn/adr-integrity Propose ADR 0004: Asset integrity check	2020-05-24 06:24:26 -04:00
Sunshine	399f515eeb	Merge pull request #178 from snshn/tests-code-refactor Group all tests into either passing or failing groups	2020-05-24 03:46:34 -04:00
Sunshine	46616f327b	Merge pull request #177 from snshn/update-readme Update README.md	2020-05-24 03:46:21 -04:00
Sunshine	090d647390	group all tests into either passing or failing groups	2020-05-23 03:49:04 -04:00
Sunshine	4fa88b7aba	update README.md	2020-05-23 03:16:08 -04:00
Sunshine	3d678d80ee	Merge pull request #176 from snshn/img-srcset IMG srcset	2020-05-17 14:26:30 -04:00
Sunshine	19a87f426e	version bump	2020-05-17 14:06:55 -04:00
Sunshine	cbe3f9f554	implement support for embedding images within srcset	2020-05-17 14:06:44 -04:00
Sunshine	b6a44c64cf	Merge pull request #174 from snshn/armhf-cd Improve CD for compiling ARM binary asset	2020-05-12 03:31:37 -04:00
Sunshine	84e2dd789c	improve CD for compiling ARM binary asset	2020-05-12 03:29:32 -04:00
Sunshine	ac4945ca97	Merge pull request #173 from snshn/sha2-integrity Add asset integrity validation	2020-05-12 03:15:02 -04:00
Sunshine	2ca2c7aff8	version bump	2020-05-12 03:10:43 -04:00
Sunshine	a18df74946	refactor code and implement integrity validation	2020-05-12 02:51:37 -04:00
Sunshine	2bc8414cc1	Merge pull request #172 from snshn/update-metadata-comment improve metadata comments	2020-04-30 22:39:25 -04:00
Sunshine	c4569343a4	improve metadata comments	2020-04-30 20:23:09 -04:00
Sunshine	5f5820c71a	Merge pull request #168 from snshn/context-comment Metadata comment tag	2020-04-30 20:06:40 -04:00
Sunshine	4719a6fecf	Merge pull request #170 from snshn/svg-image-href Embed SVG IMAGE assets	2020-04-30 20:00:59 -04:00
Sunshine	c999359b9f	Merge branch 'context-comment' of github.com:Alch-Emi/monolith into context-comment	2020-04-30 19:54:13 -04:00
Sunshine	f22e2b6e68	embed SVG IMAGE assets	2020-04-30 19:51:30 -04:00
Sunshine	31a9550f5b	Merge pull request #171 from snshn/improve-ci-cd Add rustfmt installation step to CI	2020-04-30 19:51:04 -04:00
Sunshine	201f2d61b9	add rustfmt installation step to CI	2020-04-30 19:45:44 -04:00
Sunshine	3ae4dfae8e	Update README.md	2020-04-28 09:07:47 -04:00
Sunshine	7b095fe4ff	Merge pull request #167 from snshn/version-bump version bump	2020-04-25 03:50:10 -04:00
Sunshine	890bcb1bb6	version bump	2020-04-25 01:03:49 -04:00
Sunshine	aa97ea9f82	Merge pull request #165 from snshn/no-fonts Add flag for excluding web fonts	2020-04-22 09:16:30 -04:00
Sunshine	9b40dbbf27	add option to exclude web fonts	2020-04-22 09:11:20 -04:00
Sunshine	289f3e801b	Merge pull request #161 from snshn/cache-blob Store blobs instead of data URLs in cache	2020-04-19 13:33:03 -04:00
Sunshine	edacd09dc8	store blobs instead of data URLs in cache	2020-04-19 13:26:14 -04:00
Sunshine	5682863725	Merge pull request #164 from snshn/raspberry-pi-artifact-update Update GitHub Action for assembling ARM artifacts	2020-04-18 13:46:44 -04:00
Sunshine	4304d7a638	update GitHub Action for assembling ARM artifacts	2020-04-18 13:44:26 -04:00
Sunshine	f56f88da94	Merge pull request #91 from snshn/unwrap-noscript-if-no-js Propose ADR-0002 (NOSCRIPT nodes)	2020-04-16 23:24:30 -04:00
Sunshine	87c8b361ea	add ADR-0002 (NOSCRIPT nodes)	2020-04-16 23:24:03 -04:00
Sunshine	cd505ddb6c	Merge pull request #163 from snshn/proper-css-ident-escaping Escape all special chars within #id and .class CSS selectors	2020-04-11 18:33:41 -04:00
Sunshine	eeea617fb1	escape all special chars within #id and .class CSS selectors	2020-04-11 17:50:23 -04:00
Sunshine	cc6dbddb49	Merge pull request #162 from snshn/colons-in-css-class-names Escape colons within CSS idents	2020-04-10 21:20:37 -04:00
Sunshine	9d3df2cdc6	escape colons within CSS idents	2020-04-10 20:59:56 -04:00
Sunshine	ab601c3830	Merge pull request #160 from snshn/more-css-image-url-detection-props Treat url()'s found in @counter-style rules as images	2020-04-10 07:28:55 -04:00
Sunshine	3738be2b6d	treat url()'s found in @counter-style rules as images	2020-04-10 07:22:02 -04:00
Sunshine	53160f01c7	Merge pull request #159 from snshn/implement-data-url-media-type-detection Improve data URL media type detection	2020-04-10 06:04:49 -04:00
Sunshine	594ad55bd8	improve data URL media type detection	2020-04-10 05:50:33 -04:00
Sunshine	d2615f51dc	Merge pull request #158 from snshn/improve-data-url-support Improve parsing of data URLs	2020-04-10 01:49:34 -04:00
Sunshine	c097733ae7	improve parsing of data URLs	2020-04-09 20:27:07 -04:00
Sunshine	8fbae735fa	add ADR 0004: Asset integrity check	2020-02-23 23:15:32 -05:00
Emi Simpson	05985583f0	Switch timestamps from rfc822 local time to iso8601 UTC	2020-01-10 14:30:35 -05:00
Emi Simpson	651fa716b4	Clean user, pass, and fragment from URL before writing	2020-01-10 14:18:15 -05:00
Emi Simpson	9be3982dc6	Added --no-context flag to disable adding context comment	2020-01-08 19:00:53 -05:00
Emi Simpson	27c9fb4cd3	Added comment indicating the context under which the page was downloaded	2020-01-08 18:51:18 -05:00