diff --git a/Appendix-A---Test-Sites.md b/Appendix-A---Test-Sites.md
index a906563..8fa191c 100644
--- a/Appendix-A---Test-Sites.md
+++ b/Appendix-A---Test-Sites.md
@@ -9,13 +9,13 @@ If you would like to submit a test page to be added to this list, please post th
 - [Browserprint](https://browserprint.info/test) - **h**ttps://browserprint.info/test
    * [GitHub](https://github.com/qqTYXn7/browserprint) - **h**ttps://github.com/qqTYXn7/browserprint
 - [Unique Machine](http://www.uniquemachine.org/) - **h**ttp://www.uniquemachine.org/
+- [Fingerprintjs2](https://valve.github.io/fingerprintjs2/) - **h**ttps://valve.github.io/fingerprintjs2/
 - [Inria](https://extensions.inrialpes.fr/) - **h**ttps://extensions.inrialpes.fr/
    * requires 3rd party cookies to work
 
 ### :small_orange_diamond: Multiple Tests [single page]
 - [Whoer](https://whoer.net/) - **h**ttps://whoer.net/
 - [Do I Leak?](https://www.doileak.com/) - **h**ttps://www.doileak.com/
-- [Fingerprintjs2](https://valve.github.io/fingerprintjs2/) - **h**ttps://valve.github.io/fingerprintjs2/
 - [IP/DNS Leak](https://ipleak.net/) - **h**ttps://ipleak.net/
 - [IP Duh](https://ipduh.com/anonymity-check/) - **h**ttps://ipduh.com/anonymity-check/
 - [Zscaler](http://securitypreview.zscaler.com/) - **h**ttp://securitypreview.zscaler.com/
@@ -24,6 +24,7 @@ If you would like to submit a test page to be added to this list, please post th
 ### :small_orange_diamond: Multiple Tests [multi-page]
 - [BrowserSpy.dk](http://browserspy.dk/) - **h**ttp://browserspy.dk/
 - [BrowserLeaks](https://www.browserleaks.com/) - **h**ttps://www.browserleaks.com/
+- [CanvasBlocker Test Pages](https://canvasblocker.kkapsner.de/test/) - **h**ttps://canvasblocker.kkapsner.de/test/
 - [HTML5 Test](https://html5test.com/) - **h**ttps://html5test.com/
 
 ### :small_orange_diamond: Encryption / Ciphers / SSL/TLS / Certificates
@@ -48,23 +49,17 @@ If you would like to submit a test page to be added to this list, please post th
 - [Cache Fingerprinting](http://cookieless-user-tracking.herokuapp.com/) - **h**ttp://cookieless-user-tracking.herokuapp.com/
    * It does this by assigning a unique variable in a cached script (see [#436](https://github.com/ghacksuserjs/ghacks-user.js/issues/436#issuecomment-392069853))
    * Article: https://robertheaton.com/2014/01/20/cookieless-user-tracking-for-douchebags/
-- [Canvas Blocking Detection](https://kkapsner.github.io/CanvasBlocker/test/detectionTest.html) - **h**ttps://kkapsner.github.io/CanvasBlocker/test/detectionTest.html
-   * See [Issue 174](https://github.com/ghacksuserjs/ghacks-user.js/issues/174)
 - [CSS Exfil Vulnerability](https://www.mike-gualtieri.com/css-exfil-vulnerability-tester) - **h**ttps://www.mike-gualtieri.com/css-exfil-vulnerability-tester
    * [CSS Keylogger with no CSP](https://no-csp-css-keylogger.badsite.io/) - **h**ttps://no-csp-css-keylogger.badsite.io/
 - [CSS History Leak](http://lcamtuf.coredump.cx/yahh/) <sup>1</sup> - **h**ttp://lcamtuf.coredump.cx/yahh/
+- CSS Media: disable JS, resize the browser with the tests open
+   * [@media window size leak](https://demos.traudt.xyz/css/media/index.html) - **h**ttps://demos.traudt.xyz/css/media/index.html
+   * [screen & inner window measurements](https://arthuredelstein.github.io/tordemos/media-query-fingerprint.html) - **h**ttps://arthuredelstein.github.io/tordemos/media-query-fingerprint.html
 - [DNS Leak](https://www.dnsleaktest.com/) - **h**ttps://www.dnsleaktest.com/
 - [DNS Spoofability](https://www.grc.com/dns/dns.htm) - **h**ttps://www.grc.com/dns/dns.htm
-- [Evercookie](https://samy.pl/evercookie/) - **h**ttps://samy.pl/evercookie/
-- [localStorage](http://www.filldisk.com/) - **h**ttp://www.filldisk.com/
-   * Firefox is immune to this hackery
 - [HSTS [sniffly]](http://zyan.scripts.mit.edu/sniffly/) - **h**ttp://zyan.scripts.mit.edu/sniffly/
 - [HTML5](https://www.youtube.com/html5) - **h**ttps://www.youtube.com/html5
 - [Intermediate CA Cache Fingerprinting](https://fiprinca.0x90.eu/poc/) - **h**ttps://fiprinca.0x90.eu/poc/
-- Inner Window Measurements (using media elements)
-   * disable JS, resize the browser with the tests open
-   * [@media window size leak PoC](https://demos.traudt.xyz/css/media/index.html) - **h**ttps://demos.traudt.xyz/css/media/index.html
-   * [Inner Window Measurements](https://arthuredelstein.github.io/tordemos/media-query-fingerprint.html) - **h**ttps://arthuredelstein.github.io/tordemos/media-query-fingerprint.html
 - [IPv6 Leak](http://ipv6leak.com/) - **h**ttp://ipv6leak.com/
 - [Keyboard Events](https://w3c.github.io/uievents/tools/key-event-viewer.html) - **h**ttps://w3c.github.io/uievents/tools/key-event-viewer.html
 - [Popup Killer](http://www.kephyr.com/popupkillertest/index.html) - **h**ttp://www.kephyr.com/popupkillertest/index.html