diff --git a/src/chrome/content/rules/A8.net.xml b/src/chrome/content/rules/A8.net.xml
index 82f31db724dc..578190266b39 100644
--- a/src/chrome/content/rules/A8.net.xml
+++ b/src/chrome/content/rules/A8.net.xml
@@ -17,7 +17,6 @@
 	<rule from="^http://a8\.net/"
 		to="https://a8.net/" />
 
-		<test url="http://a8.net/" />
 
 	<rule from="^http://(ad-api|direct|items|ow|pub|px|rot\d+|rpx|rws|statics|support|www|www\d+)\.a8\.net/"
 		to="https://$1.a8.net/" />
diff --git a/src/chrome/content/rules/AbuseIPDB.com.xml b/src/chrome/content/rules/AbuseIPDB.com.xml
index 9afb214beada..bfcd782a5949 100644
--- a/src/chrome/content/rules/AbuseIPDB.com.xml
+++ b/src/chrome/content/rules/AbuseIPDB.com.xml
@@ -2,8 +2,6 @@
 	<target host="abuseipdb.com" />
 	<target host="www.abuseipdb.com" />
 
-	<test url="http://abuseipdb.com/" />
-	<test url="http://www.abuseipdb.com/" />
 	<test url="http://abuseipdb.com/check/208.180.231.139" />
 	<test url="http://www.abuseipdb.com/whois/69.50.232.54" />
 
diff --git a/src/chrome/content/rules/BIGO.xml b/src/chrome/content/rules/BIGO.xml
index e0ab742a58c0..131d44ae7772 100644
--- a/src/chrome/content/rules/BIGO.xml
+++ b/src/chrome/content/rules/BIGO.xml
@@ -3,6 +3,5 @@
 
 <rule from="^http:" to="https:" />
 
-<test url="http://www.bigo.net/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Billiongraves.com.xml b/src/chrome/content/rules/Billiongraves.com.xml
index 63ccf624eaff..dc270578f085 100644
--- a/src/chrome/content/rules/Billiongraves.com.xml
+++ b/src/chrome/content/rules/Billiongraves.com.xml
@@ -18,7 +18,6 @@
 	<target host="*.billiongraves.com" />
 	<!-- <target host="store.billiongraves.com" /> -->
 
-	<test url="http://billiongraves.com/" />
 	<test url="http://www.billiongraves.com/" />
 	<test url="http://ca.billiongraves.com/" />
 	<test url="http://de.billiongraves.com/" />
diff --git a/src/chrome/content/rules/California-Franchise-Tax-Board.xml b/src/chrome/content/rules/California-Franchise-Tax-Board.xml
index 5e8849a2bd97..a94f4a11bc66 100644
--- a/src/chrome/content/rules/California-Franchise-Tax-Board.xml
+++ b/src/chrome/content/rules/California-Franchise-Tax-Board.xml
@@ -6,8 +6,6 @@
 
 	<securecookie host="^(?:(?:stats|webapp|www)\.)?ftb\.ca\.gov$" name=".+" />
 
-	<test url="http://ftb.ca.gov/" />
-	<test url="http://www.ftb.ca.gov/" />
 	<test url="http://stats.ftb.ca.gov/dcsk16hof000004bfefbkcw6o_1f9b/njs.gif?dcsuri=/nojavascript&amp;WT.js=No&amp;WT.tv=10.4.1&amp;dcssip=www.ftb.ca.gov" />
 	<test url="http://webapp.ftb.ca.gov/MyFTBAccess/iUserName.aspx" />
 
diff --git a/src/chrome/content/rules/CeskaPosta.cz.xml b/src/chrome/content/rules/CeskaPosta.cz.xml
index 58b69a7752ee..baaa9380cbb6 100644
--- a/src/chrome/content/rules/CeskaPosta.cz.xml
+++ b/src/chrome/content/rules/CeskaPosta.cz.xml
@@ -4,7 +4,6 @@
     <target host="postaonline.cz" />
     <target host="www.postaonline.cz" />
 
-    <test url="http://postaonline.cz/" />
 
     <rule from="^http://postaonline\.cz/"
             to="https://www.postaonline.cz/" />
diff --git a/src/chrome/content/rules/CloudAtCost.com.xml b/src/chrome/content/rules/CloudAtCost.com.xml
index 555f3ccef112..5d8575bdfa11 100644
--- a/src/chrome/content/rules/CloudAtCost.com.xml
+++ b/src/chrome/content/rules/CloudAtCost.com.xml
@@ -15,14 +15,9 @@
 
     <exclusion pattern="^http://panel\.cloudatcost\.com:[0-9]+/" />
 
-        <test url="http://panel.cloudatcost.com/" />
         <test url="http://panel.cloudatcost.com:12345/" />
         <test url="http://panel.cloudatcost.com:59848/console.html" />
 
     <rule from="^http:" to="https:" />
 
-        <test url="http://panel.cloudatcost.com/" />
-        <test url="http://members.cloudatcost.com/" />
-        <test url="http://panel.cloudatcost.com/" />
-
 </ruleset>
diff --git a/src/chrome/content/rules/Coccoc.com.xml b/src/chrome/content/rules/Coccoc.com.xml
index a953523368b7..d73bbea27152 100644
--- a/src/chrome/content/rules/Coccoc.com.xml
+++ b/src/chrome/content/rules/Coccoc.com.xml
@@ -3,7 +3,6 @@
 	<target host="www.coccoc.com" />
 	<target host="poipic.coccoc.com" />
 
-  <test url="http://coccoc.com/search" />
   <test url="http://coccoc.com/search" />
   <test url="http://coccoc.com/search#query=atm+ho%C3%A0n+ki%E1%BA%BFm" />
 
diff --git a/src/chrome/content/rules/Consumentenbond.nl.xml b/src/chrome/content/rules/Consumentenbond.nl.xml
index a4951fcd542a..fc4a9393e647 100644
--- a/src/chrome/content/rules/Consumentenbond.nl.xml
+++ b/src/chrome/content/rules/Consumentenbond.nl.xml
@@ -4,7 +4,6 @@
 
   <rule from="^http:" to="https:" />
 
-  <test url="http://www.consumentenbond.nl/" />
   <test url="http://www.consumentenbond.nl/juridisch-advies/" />
   <test url="http://www.consumentenbond.nl/test/geld-verzekering/" />
 </ruleset>
diff --git a/src/chrome/content/rules/Criosweb.xml b/src/chrome/content/rules/Criosweb.xml
index 8a5e054f7531..0075045da21e 100644
--- a/src/chrome/content/rules/Criosweb.xml
+++ b/src/chrome/content/rules/Criosweb.xml
@@ -6,7 +6,6 @@
 
 	<rule from="^http://infoeuri\.criosweb\.ro/$"
 		to="https://infoeuri.criosweb.ro/" />
-		<test url="http://infoeuri.criosweb.ro/" />
 
 	<rule from="^http://infoeuri\.criosweb\.ro/(aplicatie|css|fonts|img|js|povestea\.php)/"
 		to="https://infoeuri.criosweb.ro/$1/" />
@@ -30,7 +29,6 @@
 
 	<rule from="^http://luci\.criosweb\.ro/(blog/)?wp-(content|includes)/"
 		to="https://luci.criosweb.ro/$1wp-$2/" />
-		<test url="http://luci.criosweb.ro/" />
 		<test url="http://luci.criosweb.ro/blog/wp-content/themes/twentyfifteen/genericons/genericons.css" />
 		<test url="http://luci.criosweb.ro/blog/wp-includes/js/jquery/jquery-migrate.min.js" />
 		<test url="http://luci.criosweb.ro/wp-content/uploads/2015/11/board-config.png" />
@@ -42,7 +40,5 @@
 	<target host="www.criosweb.ro" />
 
 	<rule from="^http://(www\.)?criosweb\.ro/" to="https://$1criosweb.ro/" />
-		<test url="http://criosweb.ro/" />
-		<test url="http://www.criosweb.ro/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/DR.dk.xml b/src/chrome/content/rules/DR.dk.xml
index cf496bd9e7e8..69e9a629a7c1 100644
--- a/src/chrome/content/rules/DR.dk.xml
+++ b/src/chrome/content/rules/DR.dk.xml
@@ -22,7 +22,5 @@
 
 	<rule from="^http:" to="https:" />
 
-	<test url="http://www.dr.dk/" />
-	<test url="http://asset.dr.dk/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/DSLReports.xml b/src/chrome/content/rules/DSLReports.xml
index e721e1379e5d..b5a06bd9f905 100644
--- a/src/chrome/content/rules/DSLReports.xml
+++ b/src/chrome/content/rules/DSLReports.xml
@@ -29,7 +29,6 @@
 	<rule from="^http://(www\.)?dslreports\.ca/"
 		to="https://www.dslreports.com/" />
 
-		<test url="http://www.dslreports.com/" />
 
 	<rule from="^http:"
 		to="https:" />
diff --git a/src/chrome/content/rules/Destructoid.xml b/src/chrome/content/rules/Destructoid.xml
index 735f5f085248..5e9531ee8850 100644
--- a/src/chrome/content/rules/Destructoid.xml
+++ b/src/chrome/content/rules/Destructoid.xml
@@ -1,14 +1,12 @@
-<ruleset name="Destructoid">
+<ruleset name="Destructoid.com">
 	<target host="destructoid.com"/>
 	<target host="www.destructoid.com"/>
 	<target host="bulk2.destructoid.com"/>
 	<target host="cdn.destructoid.com"/>
-	<target host="store.destructoid.com"/>
-		<test url="http://www.destructoid.com/"/>
 		<test url="http://www.destructoid.com/blogs/"/>
 		<test url="http://www.destructoid.com/?t=japanator/"/>
-		<test url="http://store.destructoid.com/"/>
-		<test url="http://store.destructoid.com/deals/software/"/>
+
 	<securecookie host=".+" name=".+" />
+
 	<rule from="^http:" to="https:"/>
 </ruleset>
diff --git a/src/chrome/content/rules/Dota2lounge.com.xml b/src/chrome/content/rules/Dota2lounge.com.xml
index 3680c5b1954e..a9f19e79ba11 100644
--- a/src/chrome/content/rules/Dota2lounge.com.xml
+++ b/src/chrome/content/rules/Dota2lounge.com.xml
@@ -6,7 +6,6 @@
 	<target host="dota2lounge.com" />
 	<target host="cdn.dota2lounge.com" />
 
-	<test url="http://cdn.dota2lounge.com/" />
 	
 	<rule from="^http://cdn\.dota2lounge\.com/"
 		to="https://dota2lounge.com/" />
diff --git a/src/chrome/content/rules/Drawception.xml b/src/chrome/content/rules/Drawception.xml
index 1d3723db3a8a..55e56e59f52c 100644
--- a/src/chrome/content/rules/Drawception.xml
+++ b/src/chrome/content/rules/Drawception.xml
@@ -2,7 +2,6 @@
   <target host="drawception.com" />
   <target host="www.drawception.com" />
 
-  <test url="http://drawception.com/" />
   
   <rule from="^http:" to="https:" />
   <securecookie host="^\.?drawception\.com$" name=".+" />
diff --git a/src/chrome/content/rules/DreamHost.xml b/src/chrome/content/rules/DreamHost.xml
index 37ca1d2e84d7..848b473d66cb 100644
--- a/src/chrome/content/rules/DreamHost.xml
+++ b/src/chrome/content/rules/DreamHost.xml
@@ -66,7 +66,6 @@
 
 	<rule from="^http://dreamhoststatus\.com/"
 		to="https://www.dreamhoststatus.com/" />
-		<test url="http://dreamhoststatus.com/" />
 
 	<rule from="^http:"
 		to="https:" />
diff --git a/src/chrome/content/rules/Fenland.gov.uk.xml b/src/chrome/content/rules/Fenland.gov.uk.xml
index b236b901f86b..3542cc59156c 100644
--- a/src/chrome/content/rules/Fenland.gov.uk.xml
+++ b/src/chrome/content/rules/Fenland.gov.uk.xml
@@ -30,12 +30,12 @@
 			<test url="http://www.fenland.gov.uk/article/10466/Consultations" />
 			<test url="http://www.fenland.gov.uk/article/10471/Apply-for-it" />
 			<test url="http://www.fenland.gov.uk/article/10584/The-2015-LGC-Winner" />
+			<test url="http://www.fenland.gov.uk/article/13048/Were-not-mucking-about---clean-up-after-your-dog-or-face-a-fine" />
 			<test url="http://www.fenland.gov.uk/article/1165/New-Vision-Fitness" />
 			<test url="http://www.fenland.gov.uk/article/2916/Jobs" />
 			<test url="http://www.fenland.gov.uk/article/2917/Planning-Register" />
 			<test url="http://www.fenland.gov.uk/article/2919/Council-Tax" />
 			<test url="http://www.fenland.gov.uk/article/5382/Connecting-Cambridgeshire" />
-			<test url="http://www.fenland.gov.uk/article/5382/Connecting-Cambridgeshire" />
 			<test url="http://www.fenland.gov.uk/article/5910/The-2014-MJ-Winner/" />
 			<test url="http://www.fenland.gov.uk/article/6273/Source-Cambridgeshire" />
 			<test url="http://www.fenland.gov.uk/article/9124/Golden-Age-Partners" />
diff --git a/src/chrome/content/rules/FullSlate.xml b/src/chrome/content/rules/FullSlate.xml
index a10b5ffbd956..13eeaa03f2d6 100644
--- a/src/chrome/content/rules/FullSlate.xml
+++ b/src/chrome/content/rules/FullSlate.xml
@@ -2,7 +2,6 @@
 	<target host="fullslate.com" />
 	<target host="*.fullslate.com" />
 
-	<test url="http://fullslate.com/" />
 	<test url="http://www.fullslate.com/" />
 	<test url="http://app.fullslate.com/" />
 	<test url="http://dudamobile.fullslate.com/" />
diff --git a/src/chrome/content/rules/GoogleAPIs.xml b/src/chrome/content/rules/GoogleAPIs.xml
index 92172b139230..3993d9d3ddfe 100644
--- a/src/chrome/content/rules/GoogleAPIs.xml
+++ b/src/chrome/content/rules/GoogleAPIs.xml
@@ -119,7 +119,6 @@
 		<test url="http://ct.googleapis.com/aviator/ct/v1/get-entries?start=0&amp;end=1" />
 		<test url="http://chart.googleapis.com/chart?cht=p3&amp;chs=250x100&amp;chd=t:60,40&amp;chl=Hello|World" />
 		<test url="http://fonts.googleapis.com/css?family=Tangerine" />
-		<test url="http://imasdk.googleapis.com/" />
 		<test url="http://maps.googleapis.com/maps/ms?hl=da&amp;ie=UTF8&amp;msa=0&amp;msid=213981917930555964408.00044f8886ceeef1c1b88&amp;source=embed&amp;ll=55.432276,9.439402&amp;spn=0.017045,0.043774&amp;z=14" />
 
 	<rule from="^http://([\w-]+\.)?(commondata)?storage\.googleapis\.com/"
diff --git a/src/chrome/content/rules/HH.ru.xml b/src/chrome/content/rules/HH.ru.xml
index c24e96ce29d7..d947cffb1b52 100644
--- a/src/chrome/content/rules/HH.ru.xml
+++ b/src/chrome/content/rules/HH.ru.xml
@@ -175,7 +175,6 @@
 		<test url="http://slavgorod.hh.ru/" />
 		<test url="http://smolensk.hh.ru/" />
 		<test url="http://soltsy.hh.ru/" />
-		<test url="http://soltsy.hh.ru/" />
 		<test url="http://sorochinsk.hh.ru/" />
 		<test url="http://sortavala.hh.ru/" />
 		<test url="http://sovetskij.hh.ru/" />
diff --git a/src/chrome/content/rules/Hdfcbank.com.xml b/src/chrome/content/rules/Hdfcbank.com.xml
index 2cbd10e2cedd..3154c569aaa6 100644
--- a/src/chrome/content/rules/Hdfcbank.com.xml
+++ b/src/chrome/content/rules/Hdfcbank.com.xml
@@ -2,16 +2,16 @@
 	Problematic subdomains:
 		
 		- ideabank.hdfcbank.com (No valid https page)
+		- imaging.hdfcbank.com (Incomplete certificate chain)
 		- mailer.hdfcbank.com (https version redirects to http://www.hdfcbank.com. Not adding rule as it would render this subdomain unuseable)
+		- punjabadds.hdfcbank.com (Incomplete certificate chain)
 		- testmailer.hdfcbank.com (https version redirects to http://www.hdfcbank.com)	
-		- https://mobilityrpmcc.hdfcbank.com/ (Incomplete certificate chain)
 
 	HTTPS Only domains:
 		- https://getprepaidcard.hdfcbank.com/
 		- https://netsafe.hdfcbank.com/
 		- https://nriapply.hdfcbank.com/
 		- https://netbanking.hdfcbank.com/
-		- https://imaging.hdfcbank.com/
 		- https://ifms.hdfcbank.com/
 		- https://corporate.hdfcbank.com/
 		- https://cms.hdfcbank.com/
@@ -39,14 +39,13 @@
 	<target host="nriapply.hdfcbank.com" />
 	<target host="netbanking.hdfcbank.com" />
 	<target host="m.netbanking.hdfcbank.com" />
-	<target host="imaging.hdfcbank.com" />
 	<target host="ifms.hdfcbank.com" />
 	<target host="corporate.hdfcbank.com" />
 	<target host="cms.hdfcbank.com" />
 	<target host="leads.hdfcbank.com" />
 	<target host="apply.hdfcbank.com" />
 	<target host="enetbanking.hdfcbank.com" />
-	<target host="punjabadds.hdfcbank.com" />
+	<target host="mobilityrpmcc.hdfcbank.com" />
 	<target host="mofpi.hdfcbank.com" />
 	<target host="los.hdfcbank.com" />
 	<target host="dncdedupe.hdfcbank.com" />
@@ -60,25 +59,13 @@
 	<target host="usedcar.hdfcbank.com" />
 	<target host="payzapp.biz.hdfcbank.com" />
 
-	<test url="http://www.hdfcbank.com/" />
 	<test url="http://offers.smartbuy.hdfcbank.com/" />
 	<test url="http://mobileoffers.smartbuy.hdfcbank.com/" />
 	<test url="http://mobileoffers.smartbuy.hdfcbank.com/recharge" />
 	<test url="http://www.hdfcbank.com/smartemi" />
-	<test url="http://getprepaidcard.hdfcbank.com/" />
-	<test url="http://netsafe.hdfcbank.com/" />
-	<test url="http://nriapply.hdfcbank.com/" />
-	<test url="http://netbanking.hdfcbank.com/" />
-	<test url="http://m.netbanking.hdfcbank.com/" />
-	<test url="http://imaging.hdfcbank.com/" />
 	<test url="http://ifms.hdfcbank.com/delfin" />
-	<test url="http://corporate.hdfcbank.com/" />
-	<test url="http://cms.hdfcbank.com/" />
-	<test url="http://leads.hdfcbank.com/" />
-	<test url="http://apply.hdfcbank.com/" />
 	<test url="http://apply.hdfcbank.com/BranchAuto/NewToBank" />
 	<test url="http://enetbanking.hdfcbank.com/corporate/CorporateLogin.html" />
-	<test url="http://punjabadds.hdfcbank.com/punjabprocess/login.aspx" />
 	<test url="http://mofpi.hdfcbank.com/EnetMVC/" />
 	<test url="http://los.hdfcbank.com/LOSHDFC/CheckLogin.los" />
 	<test url="http://dncdedupe.hdfcbank.com/dnc/login.htm" />
@@ -90,7 +77,6 @@
 	<test url="http://remit.hdfcbank.com/htdocs/common/pdf/ECSS_ApplicationForm.pdf" />
 	<test url="http://sme.hdfcbank.com/LoanFloWeb/Index.jsp" />
 	<test url="http://usedcar.hdfcbank.com/htdocs/aboutus/awards/bt_awards.htm" />
-	<test url="http://payzapp.biz.hdfcbank.com/" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Hn.premii.com.xml b/src/chrome/content/rules/Hn.premii.com.xml
index 99877ea210ab..bbdf0762897d 100644
--- a/src/chrome/content/rules/Hn.premii.com.xml
+++ b/src/chrome/content/rules/Hn.premii.com.xml
@@ -4,10 +4,6 @@
 	<target host="reddit.premii.com" />
 	<target host="www.premii.com" />
 
-	<test url="http://premii.com/" />
-	<test url="http://hn.premii.com/" />
-	<test url="http://reddit.premii.com/" />
-	<test url="http://www.premii.com/" />
 
 	<rule from="^http://www\.premii\.com/"
 		to="https://premii.com/" />
diff --git a/src/chrome/content/rules/Imgs_Mail.ru.xml b/src/chrome/content/rules/Imgs_Mail.ru.xml
index 2aac54edccc0..db130d5d4426 100644
--- a/src/chrome/content/rules/Imgs_Mail.ru.xml
+++ b/src/chrome/content/rules/Imgs_Mail.ru.xml
@@ -61,9 +61,10 @@
 		<test url="http://go1.imgsmail.ru/" />
 		<test url="http://go1.imgsmail.ru/static/web/img/go-form__submit-btn.png" />
 		<test url="http://go1.imgsmail.ru/static/web/img/main_sprite.png" />
-		<test url="http://go1.imgsmail.ru/static/web/img/main_sprite.png" />
 		<test url="http://go1.imgsmail.ru/static/web/img/sprites/main/communities.png" />
 		<test url="http://hi-tech.imgsmail.ru/" />
+		<test url="http://img.imgsmail.ru/r/new_share_buttons_sprite.gif" />
+		<test url="http://img1.imgsmail.ru/r/new_share_buttons_sprite.gif" />
 		<test url="http://limg.imgsmail.ru/" />
 		<test url="http://minigames.imgsmail.ru/" />
 		<test url="http://proxy.imgsmail.ru/" />
diff --git a/src/chrome/content/rules/Infra-Furth.xml b/src/chrome/content/rules/Infra-Furth.xml
index 5752e8ab13b8..7388fdf01a5c 100644
--- a/src/chrome/content/rules/Infra-Furth.xml
+++ b/src/chrome/content/rules/Infra-Furth.xml
@@ -6,7 +6,6 @@
 <rule from="^http:" to="https:" />
 <!-- <rule from="^http://www\.stadtverkehr-fuerth\.de/" to="https://www.stadtverkehr-fuerth.de/"/> -->
 
-<test url="http://www.infra-fuerth.de/" />
 <!-- <test url="http://www.stadtverkehr-fuerth.de/" /> -->
 
 </ruleset>
diff --git a/src/chrome/content/rules/JD.com-Problematic.xml b/src/chrome/content/rules/JD.com-Problematic.xml
index b92cb1bb44c8..4bee368e7dc7 100644
--- a/src/chrome/content/rules/JD.com-Problematic.xml
+++ b/src/chrome/content/rules/JD.com-Problematic.xml
@@ -31,7 +31,6 @@
 	<exclusion pattern="^http://acsten.jd.com/$" />
 	<rule from="^http://acsten\.jd\.com/"
 		to="https://acsten.jd.com/" />
-		<test url="http://acsten.jd.com/" />
 		<test url="http://acsten.jd.com/static/brands/puppyoo/en/bg_521_01.jpg" />
 
 	<target host="authcode.jd.com" />
@@ -41,18 +40,13 @@
 		<test url="http://authcode.jd.com/verify/image?a=1&amp;acid=46e37f33-c280-410f-822e-3295caae06fd&amp;uid=46e37f33-c280-410f-822e-3295caae06fd&amp;yys=1425883312677" />
 
 	<target host="c-nfa.jd.com" />
-	<exclusion pattern="^http://c-nfa.jd.com/$" />
-	<rule from="^http://c-nfa\.jd\.com/.+&amp;url=//(.+)/"
-		to="https://$1/" />
-		<test url="http://c-nfa.jd.com/adclick?keyStr=z5AXFoIimt1jiDK32+w4mfTFZtF1YOC+opB7Ao37jUjDSR4ZkhdprAyoH1hPJzIvYIvzFrd2TCsHa9MPtmJJ38/q5Qih+7c1BDeh8zmM5DtHWmoByPeXmwN+vPPmAue8nPRVaxDTMvb4FGTgPthakqmhEn5VjYb//IDriB1m2VsGNejglATI3rYKcJNNinLWO8kB+sSzSS0dWVpqx287jLMnQRjLX8LeruC5DQu2wwDKXBn/4XyfZBkqZDvr0dRqsYAhmxRmBoISpVNFyZRXL4a+892nOos/0aSRnf6vbMmf9HLeDipRHAKm4vcfN+U1KKFU6qVYkYEbrR18iEkgIA==&amp;cv=2.0&amp;url=//sale.jd.com/act/o1Yagd0IiDNGc.html" />
-		<test url="http://c-nfa.jd.com/adclick?keyStr=z5AXFoIimt1jiDK32+w4mT1nRnpFpAizF+5WhO0AHkwztMovE9R5AVbwwls8hQ5kPIi3cMEhhoV6ooyGp0aJkRpamRD4zxoXfKU1fYn2dDNa4eG9P+LQ+i7XDdn0nvJzLUHKRy5AMBHgXaliXNh0TR/99MUGL/DAI9QQrj/aPDO+rjt+wmNBqathelSaHUsWvi3DP9vR6BVkUfiEtycMxl/Qae9xh2e/T9YWCueIsatyVMmKJ+LujoLlfkmAfmKTYpUboR8ciyR5H4ne31buZoYjevjHNvGqTDM3fonDawQ=&amp;cv=2.0&amp;url=//zbird.jd.com/" />
-		<test url="http://c-nfa.jd.com/adclick?keyStr=6PQwtwh0f06syGHwQVvRO5ztV98xI1kb04VWxj27qyHhTr8/YivtDmYW6ZcIZV4BhtMfyzQy3d2vyFSlAb5kvHrWjH42RUbxLhwOK41QshZHWmoByPeXmwN+vPPmAue8mmUBBv3jNBcx2P/iDtTmlnWDS2AWBitvTotLMyrh0gWj/QmG6Hzf2c4HDr/5L48+9tBUiEEIuYKGXbq9vzM2Lqy/C1Kvp7QdX/NpCflYIjVCh34pjEI9yMOFfVGi4Ym9ZZfyyAExFGwJ/7N9isOCE/th/T/WZaFB38TA49bffI3pjvqkRSOdaFeco1V1km9VcJnJ8/i4ypiBDe/7mST+Nw7Yv1DRlzva1IPuVpLUl/CoIYJKTBYHRRkT9yWbX5d8&amp;cv=2.0&amp;url=//search.jd.hk/Search?keyword=%E7%A2%A7%E7%84%B6%E5%BE%B7&amp;enc=utf-" />
+	<rule from="^http://c-nfa\.jd\.com/"
+		to="https://c-nfa.jd.com/" />
 
 	<target host="ccc.jd.com" />
 	<exclusion pattern="^http://ccc.jd.com/$" />
 	<rule from="^http://ccc\.jd\.com/"
 		to="https://ccc.jd.com/" />
-		<test url="http://ccc.jd.com/" />
 		<test url="http://ccc.jd.com/cookie_check" />
 
 	<target host="item.jd.com" />
diff --git a/src/chrome/content/rules/JianGuoYun.xml b/src/chrome/content/rules/JianGuoYun.xml
index 33dc469a0491..98eb6f6206cb 100644
--- a/src/chrome/content/rules/JianGuoYun.xml
+++ b/src/chrome/content/rules/JianGuoYun.xml
@@ -14,7 +14,6 @@
 
 	  <!--  MCB:  -->
 		<exclusion pattern="^http://bbs\.jianguoyun\.com/(?!my-templates/)" />
-		<test url="http://bbs.jianguoyun.com/" />
 		<test url="http://bbs.jianguoyun.com/forum.php?id=1" />
 		<test url="http://bbs.jianguoyun.com/my-templates/nutstore/style.css" />
 
diff --git a/src/chrome/content/rules/Komoona.com.xml b/src/chrome/content/rules/Komoona.com.xml
index fb316318e715..462e2c9caec9 100644
--- a/src/chrome/content/rules/Komoona.com.xml
+++ b/src/chrome/content/rules/Komoona.com.xml
@@ -1,41 +1,27 @@
 <!--
-	CDN buckets:
+	Non-functional hosts:
+		Expired certificates:
+		- a1.komoona.com
+		- a2.komoona.com
+		- a3.komoona.com
 
-		- dimrh7ecexr02.cloudfront.net
+		Timeout:
+		- e1.komoona.com
+		- e2.komoona.com
+		- test.komoona.com
 
-			- cdn
-
-
-	At least some pages redirect to http.
-
-	TLS not supported on:
-		-	test.komoona.com - self-signed
 -->
 <ruleset name="Komoona.com (partial)">
 
 	<target host="komoona.com" />
 	<target host="a.komoona.com" />
-	<target host="a1.komoona.com" />
-	<target host="a2.komoona.com" />
-	<target host="a3.komoona.com" />
 	<target host="a4.komoona.com" />
 	<target host="admin.komoona.com" />
 	<target host="cdn.komoona.com" />
-	<target host="cs.komoona.com" />
-	<target host="e1.komoona.com" />
-	<target host="e2.komoona.com" />
 	<target host="s.komoona.com" />
 	<target host="stat.komoona.com" />
-	<target host="w.komoona.com" />
 	<target host="www.komoona.com" />
 
-		<exclusion pattern="^http://www\.komoona\.com/(?!favicon\.ico|new/css/|new/images/)" />
-
-	<test url="http://www.komoona.com/" />
-	<test url="http://www.komoona.com/favicon.ico" />
-	<test url="http://www.komoona.com/new/css" />
-	<test url="http://www.komoona.com/new/images" />
-
 	<!--	Not secured by server:
 					-->
 	<!--securecookie host="^(a|stat)\.komoona\.com$" name="^AWSELB$" /-->
diff --git a/src/chrome/content/rules/Lands_End.com.xml b/src/chrome/content/rules/Lands_End.com.xml
index e955b209d6b8..6eece9242f7f 100644
--- a/src/chrome/content/rules/Lands_End.com.xml
+++ b/src/chrome/content/rules/Lands_End.com.xml
@@ -42,7 +42,6 @@
 		to="https://business.landsend.com/" />
 
 
-	<test url="http://business.landsend.com/" />
 	<test url="http://www.landsend.com/pps/r3f9221c/js/_apps/index/app/results/results.directive.html" />
 	<test url="http://www.landsend.com/pps/r3f9221c/js/_apps/index/app/breadcrumb/breadcrumb.directive.html" />
 	<test url="http://www.landsend.com/pps/r3f9221c/js/_apps/index/app/sidebar/sidebar.directive.html" />
diff --git a/src/chrome/content/rules/Letterboxd.com.xml b/src/chrome/content/rules/Letterboxd.com.xml
index ec4988bdf4ff..2454ec9894fd 100644
--- a/src/chrome/content/rules/Letterboxd.com.xml
+++ b/src/chrome/content/rules/Letterboxd.com.xml
@@ -26,8 +26,6 @@
 	<target host="s2.ltrbxd.com" />
 <!-- 	<target host="*.s2.ltrbxd.com" /> -->
 
-	<test url="http://letterboxd.com/" />
-	<test url="http://www.letterboxd.com/" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Lynda.com.xml b/src/chrome/content/rules/Lynda.com.xml
index 2846ac82e1d5..e6c7f2e04516 100644
--- a/src/chrome/content/rules/Lynda.com.xml
+++ b/src/chrome/content/rules/Lynda.com.xml
@@ -43,7 +43,6 @@
 					-->
 			<test url="http://www.lynda.com/apps/ios" />
 			<test url="http://www.lynda.com/business" />
-			<test url="http://www.lynda.com/business" />
 			<test url="http://www.lynda.com/government" />
 			<test url="http://www.lynda.com/login/loginhelp.aspx" />
 			<test url="http://www.lynda.com/promo/trial/default.aspx" />
diff --git a/src/chrome/content/rules/Mamba.xml b/src/chrome/content/rules/Mamba.xml
index 2036be5a94af..29b589130061 100644
--- a/src/chrome/content/rules/Mamba.xml
+++ b/src/chrome/content/rules/Mamba.xml
@@ -12,7 +12,6 @@
 
 	<rule from="^http:" to="https:" />
 
-	<test url="http://mamba.ru/" />
 	<test url="http://www.mamba.ru/" />
 	<test url="http://corp.mamba.ru/" />
 	<test url="http://partner.mamba.ru/" />
diff --git a/src/chrome/content/rules/Mozilla.xml b/src/chrome/content/rules/Mozilla.xml
index 4e9199007dc2..f9c1054858d3 100644
--- a/src/chrome/content/rules/Mozilla.xml
+++ b/src/chrome/content/rules/Mozilla.xml
@@ -244,7 +244,6 @@
 		<test url="http://ftp.mozilla.org/" />
 		<test url="http://git.mozilla.org/" />
 		<test url="http://hg.mozilla.org/" />
-		<test url="http://image.e.mozilla.org/" />
 		<test url="http://krakenbenchmark.mozilla.org/" />
 		<test url="http://lists.mozilla.org/" />
 		<test url="http://planet.mozilla.org/" />
diff --git a/src/chrome/content/rules/My.com.xml b/src/chrome/content/rules/My.com.xml
index 1721aad6db13..30d9c5a9d3cc 100644
--- a/src/chrome/content/rules/My.com.xml
+++ b/src/chrome/content/rules/My.com.xml
@@ -15,7 +15,6 @@
     <target host="my.com" />
     <target host="*.my.com" />
 	
-	<test url="http://mymail.my.com/" />
 	<test url="http://account.my.com/" />
 	<test url="http://allods.my.com/" />
 	<test url="http://aw.my.com/" />
@@ -37,7 +36,6 @@
 	<test url="http://sf.my.com/" />
 	<test url="http://support.my.com/" />
 	<test url="http://target.my.com/" />
-	<test url="http://target.my.com/" />
 	<test url="http://wos.my.com/" />
 
     <securecookie host="^(.*\.)?my\.com$" name=".+" />
diff --git a/src/chrome/content/rules/N-ERGIE.xml b/src/chrome/content/rules/N-ERGIE.xml
index 0e582ce29786..231739f5d612 100644
--- a/src/chrome/content/rules/N-ERGIE.xml
+++ b/src/chrome/content/rules/N-ERGIE.xml
@@ -3,6 +3,5 @@
 
 <rule from="^http:" to="https:" />
 
-<test url="http://www.n-ergie.de/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Neowin.net.xml b/src/chrome/content/rules/Neowin.net.xml
index cf954c90a08e..d1930a69b968 100644
--- a/src/chrome/content/rules/Neowin.net.xml
+++ b/src/chrome/content/rules/Neowin.net.xml
@@ -2,9 +2,7 @@
 	<target host="neowin.net"/>
 	<target host="www.neowin.net"/>
 	<target host="deals.neowin.net"/>
-	<test url="http://neowin.net/"/>
 		<test url="http://neowin.net/forum/"/>
-		<test url="http://deals.neowin.net/"/>
 	<securecookie host=".+" name=".+" />
 	<rule from="^http:" to="https:"/>
 </ruleset>
diff --git a/src/chrome/content/rules/NoteFly.xml b/src/chrome/content/rules/NoteFly.xml
index 8d39427803c8..88010b270b86 100644
--- a/src/chrome/content/rules/NoteFly.xml
+++ b/src/chrome/content/rules/NoteFly.xml
@@ -3,7 +3,6 @@
 	<target host="notefly.org" />
 	<target host="www.notefly.org" />
 
-	<test url="http://notefly.org/" />
 	<test url="http://www.notefly.org/downloads" />
 
 	<rule from="^http:"
diff --git a/src/chrome/content/rules/Nurago.xml b/src/chrome/content/rules/Nurago.xml
index ea100f70bffa..ae34cf6f6cb8 100644
--- a/src/chrome/content/rules/Nurago.xml
+++ b/src/chrome/content/rules/Nurago.xml
@@ -9,8 +9,5 @@
 	<rule from="^http:"
 		to="https:" />
 
-	<test url="http://sensic.net/" />
-	<test url="http://www.sensic.net/" />
-	<test url="http://mco-pb.sensic.net/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Okoun.cz.xml b/src/chrome/content/rules/Okoun.cz.xml
index 5280de9e2551..20548a066dcd 100644
--- a/src/chrome/content/rules/Okoun.cz.xml
+++ b/src/chrome/content/rules/Okoun.cz.xml
@@ -8,5 +8,4 @@
 
 	<rule from="^http:" to="https:" />
 
-	<test url="http://www.okoun.cz/" />
 </ruleset>
diff --git a/src/chrome/content/rules/Post.at.xml b/src/chrome/content/rules/Post.at.xml
index c6a08ef8bc8f..689a8113d290 100644
--- a/src/chrome/content/rules/Post.at.xml
+++ b/src/chrome/content/rules/Post.at.xml
@@ -19,7 +19,6 @@
 	<test url="http://paolapanel.post.at/" />
 	<test url="http://philawiki.post.at/" />
 	<test url="http://secure.post.at/" />
-	<test url="http://secure.post.at/" />
 	<test url="http://versandmanager.post.at/" />
 
 	<rule from="^http:" to="https:" />
diff --git a/src/chrome/content/rules/PravyDiplom.cz.xml b/src/chrome/content/rules/PravyDiplom.cz.xml
index 0fe773e88f04..544c09ea99bb 100644
--- a/src/chrome/content/rules/PravyDiplom.cz.xml
+++ b/src/chrome/content/rules/PravyDiplom.cz.xml
@@ -11,7 +11,6 @@
 	<!--securecookie host="^pravydiplom\.cz$" name="^issession$" /-->
 	<securecookie host="^pravydiplom\.cz$" name=".+" />
 
-	<test url="http://www.pravydiplom.cz/" />
 
 	<rule from="^http://www\.pravydiplom\.cz/" to="https://pravydiplom.cz/" />
 	<rule from="^http:" to="https:" />
diff --git a/src/chrome/content/rules/PropellerAds.xml b/src/chrome/content/rules/PropellerAds.xml
index 8c0a25d37d18..7f3798a2753d 100644
--- a/src/chrome/content/rules/PropellerAds.xml
+++ b/src/chrome/content/rules/PropellerAds.xml
@@ -13,13 +13,6 @@
 
 		- (www.)propellerads.com	(rx_record_too_long)
 
-
-	Problematic hosts in *propellerads.com:
-
-		- img ᵐ
-
-	ᵐ Mismatched
-
 -->
 <ruleset name="PropellerAds.com (partial)">
 
@@ -27,19 +20,10 @@
 				-->
 	<target host="ad.propellerads.com" />
 
-	<!--	Complications:
-				-->
-	<target host="img.propellerads.com" />
-
 
 	<securecookie host="^\w" name=".+" />
 
 
-	<rule from="^http://img\.propellerads\.com/"
-		to="https://ad.propellerads.com/" />
-		
-	<test url="http://ad.propellerads.com/" />
-
 	<rule from="^http:"
 		to="https:" />
 
diff --git a/src/chrome/content/rules/R-kom.xml b/src/chrome/content/rules/R-kom.xml
index b8a478355711..919efe1aa0a8 100644
--- a/src/chrome/content/rules/R-kom.xml
+++ b/src/chrome/content/rules/R-kom.xml
@@ -5,7 +5,5 @@
 <rule from="^http:" to="https:" />
 <!-- tls cert isn't valid for the main page www.glasfaser-ostbayern.de -->
 
-<test url="http://kundenportal.r-kom.de/" />
-<test url="http://www.r-kom.de/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/RIA.com.xml b/src/chrome/content/rules/RIA.com.xml
index 9fe513d331cd..366421fe240f 100644
--- a/src/chrome/content/rules/RIA.com.xml
+++ b/src/chrome/content/rules/RIA.com.xml
@@ -164,7 +164,6 @@
 		<test url="http://shepetivka.ria.com/" />
 		<test url="http://shostka.ria.com/" />
 		<test url="http://simeiz.ria.com/" />
-		<test url="http://simeiz.ria.com/" />
 		<test url="http://simferopol.ria.com/" />
 		<test url="http://sinelnikovo.ria.com/" />
 		<test url="http://skadovsk.ria.com/" />
diff --git a/src/chrome/content/rules/SPORTISIMO.xml b/src/chrome/content/rules/SPORTISIMO.xml
index 7e969b9cd1d9..6a8170282377 100644
--- a/src/chrome/content/rules/SPORTISIMO.xml
+++ b/src/chrome/content/rules/SPORTISIMO.xml
@@ -14,7 +14,6 @@
     <target host="sportisimo.com" />
     <target host="www.sportisimo.com" />
 
-    <test url="http://sportisimo.com/" />
 
     <rule from="^http://sportisimo\.com/"
             to="https://www.sportisimo.com/" />
diff --git a/src/chrome/content/rules/SpeedBurger.xml b/src/chrome/content/rules/SpeedBurger.xml
index 804e03e6b8af..8ceef43ab9c6 100644
--- a/src/chrome/content/rules/SpeedBurger.xml
+++ b/src/chrome/content/rules/SpeedBurger.xml
@@ -3,7 +3,6 @@
 	<target host="speed-burger.com" />
 	<target host="www.speed-burger.com" />
 
-	<test url="http://speed-burger.com/" />
 	<test url="http://www.speed-burger.com/mon-compte/creer-un-compte/" />
 	<test url="http://www.speed-burger.com/livraison-hamburger/" />
 
diff --git a/src/chrome/content/rules/Spiderweb-Software.xml b/src/chrome/content/rules/Spiderweb-Software.xml
index fe1455968994..0b698620dbe0 100644
--- a/src/chrome/content/rules/Spiderweb-Software.xml
+++ b/src/chrome/content/rules/Spiderweb-Software.xml
@@ -32,9 +32,6 @@
 
 	<securecookie host="^\w" name=".+" />
 
-	<test url="http://www.spiderwebsoftware.com/" />
-	<test url="http://spidweb.com/" />
-	<test url="http://www.spidweb.com/" />
 
 	<rule from="^http://(?:(?:www\.)?spidweb|www\.spiderwebsoftware)\.com/"
 		to="https://spiderwebsoftware.com/" />
diff --git a/src/chrome/content/rules/Sternkom.xml b/src/chrome/content/rules/Sternkom.xml
index aeccafce988e..7d48bf8acb52 100644
--- a/src/chrome/content/rules/Sternkom.xml
+++ b/src/chrome/content/rules/Sternkom.xml
@@ -3,6 +3,5 @@
 
 <rule from="^http:" to="https:" />
 
-<test url="http://www.sternkom.de/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Swu.de.xml b/src/chrome/content/rules/Swu.de.xml
index b1d1d81ae69c..5c7000b7c9b3 100644
--- a/src/chrome/content/rules/Swu.de.xml
+++ b/src/chrome/content/rules/Swu.de.xml
@@ -3,5 +3,4 @@
 
 <rule from="^http:" to="https:" />
 
-<test url="http://www.swu.de/" />
 </ruleset>
diff --git a/src/chrome/content/rules/Tangerine-Bank.xml b/src/chrome/content/rules/Tangerine-Bank.xml
index 7c751aa2a31d..861fdbc2092d 100644
--- a/src/chrome/content/rules/Tangerine-Bank.xml
+++ b/src/chrome/content/rules/Tangerine-Bank.xml
@@ -24,7 +24,6 @@
 	<target host="tangerine.com" />
 	<target host="www.tangerine.com" />
 
-	<test url="http://tangerine.com/" />
 
 	<securecookie host=".+" name=".+" />
 
diff --git a/src/chrome/content/rules/Threema.xml b/src/chrome/content/rules/Threema.xml
index 4e7f27cf8c1b..18ac90b70c6a 100644
--- a/src/chrome/content/rules/Threema.xml
+++ b/src/chrome/content/rules/Threema.xml
@@ -11,18 +11,14 @@
     <target host="web-beta.threema.ch" />
 
     <test url="http://threema.ch/en/whats-new" />
-    <test url="http://www.threema.ch/" />
     <test url="http://gateway.threema.ch/en/developer/api" />
     <test url="http://shop.threema.ch/download" />
     <test url="http://myid.threema.ch/revoke" />
     <test url="http://myid.threema.ch/unlink" />
     <test url="http://avatar.threema.ch/*THREEMA" />
-    <test url="http://avatar.threema.ch/" />
-    <test url="http://web.threema.ch/" />
-    <test url="http://web-beta.threema.ch/" />
     
     <!-- The main page serves a 403 reply -->
-    <exclusion pattern="http://avatar\.threema\.ch/?$" />
+    <exclusion pattern="http://avatar\.threema\.ch/$" />
 
     <securecookie host="^(www.|gateway.|work.|shop\.|myid.|web.|web-beta.)?threema\.ch" name=".+" />
 
diff --git a/src/chrome/content/rules/Tickets.gwr.com.xml b/src/chrome/content/rules/Tickets.gwr.com.xml
index 8b84b60330b3..48913593a91f 100644
--- a/src/chrome/content/rules/Tickets.gwr.com.xml
+++ b/src/chrome/content/rules/Tickets.gwr.com.xml
@@ -1,7 +1,6 @@
 <ruleset name="Tickets.gwr.com">
 	<target host="tickets.gwr.com" />
 
-	<test url="http://tickets.gwr.com/" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/Twenga.com.xml b/src/chrome/content/rules/Twenga.com.xml
index b628c2b74448..728ae35834a1 100644
--- a/src/chrome/content/rules/Twenga.com.xml
+++ b/src/chrome/content/rules/Twenga.com.xml
@@ -49,10 +49,10 @@
 					-->
 			<test url="http://blog.twenga.com/" />
 			<test url="http://blog.twenga.com/css.php" />
-			<test url="http://blog.twenga.com/wp-login.php" />
+			<test url="http://blog.twenga.com/css.php?ts=20180318" />
 			<test url="http://blog.twenga.com/wp-login.php" />
 
-		<test url="http://dynstatic.twenga.com/ressource/url/image/?k=424_0_0&amp;e=&amp;d=http%3A%2F%2Fwww.twenga.com" />
+		<test url="http://dynstatic.twenga.com/" /><!-- 403 Forbidden on Travis -->
 		<test url="http://i00.twenga.com/cms/img_75577.jpg" />
 		<test url="http://i20.twenga.com/jewelry/earrings/detachable-10-components-earrings-tp_2387598266290741051b.jpg" />
 		<test url="http://i21.twenga.com/jewelry/earrings/george-kovacs-earring-mini-tp_8713335219619646942b.jpg" />
diff --git a/src/chrome/content/rules/Urbanartcloud.com.xml b/src/chrome/content/rules/Urbanartcloud.com.xml
index 01d28c175485..3242c3f21af7 100644
--- a/src/chrome/content/rules/Urbanartcloud.com.xml
+++ b/src/chrome/content/rules/Urbanartcloud.com.xml
@@ -4,6 +4,5 @@
 
 <rule from="^http:" to="https:" />
 
-<test url="http://www.urbanartcloud.com/" />
 
 </ruleset>
diff --git a/src/chrome/content/rules/Uservoice.xml b/src/chrome/content/rules/Uservoice.xml
index 2da33bec7252..6838f86ed208 100644
--- a/src/chrome/content/rules/Uservoice.xml
+++ b/src/chrome/content/rules/Uservoice.xml
@@ -36,7 +36,6 @@
 
 	<securecookie host="^(?!email\.|email\.feedback-poweredby\.|www6\.)\w" name=".+" />
 
-	<test url="http://uservoice.com/" />
 	<test url="http://app.uservoice.com/" />
 	<test url="http://blog.uservoice.com/" />
 	<test url="http://by.uservoice.com/" />
diff --git a/src/chrome/content/rules/WP-Engine.xml b/src/chrome/content/rules/WP-Engine.xml
index ea0739a52696..2b03d5560d05 100644
--- a/src/chrome/content/rules/WP-Engine.xml
+++ b/src/chrome/content/rules/WP-Engine.xml
@@ -15,7 +15,6 @@
 	Problematic subdomains:
 
 		- cdn			(404; mismatched, CN: *.netdna-ssl.com)
-		- press			(mismatched, CN: *.heroku.com)
 		- *.*.wpengine.com	(mismatched, CN: *.wpengine.com)
 
 
@@ -25,7 +24,7 @@
 		- cdn		(→ ^)
 		- devbox
 		- my
-		- press		(→ wpengine.totemapp.com)
+		- press
 		- signup
 		- support
 		- \w+ *
@@ -60,7 +59,6 @@
 	<target host="wpengine.com" />
 	<target host="*.wpengine.com" />
 
-		<test url="http://wpengine.com/" />
 		<test url="http://cdn.wpengine.com/" />
 		<test url="http://devbox.wpengine.com/" />
 		<test url="http://my.wpengine.com/" />
@@ -89,9 +87,6 @@
 	<rule from="^http://cdn\.wpengine\.com/"
 		to="https://wpengine.com/" />
 
-	<rule from="^http://press\.wpengine\.com/"
-		to="https://wpengine.totemapp.com/" />
-
 	<rule from="^http:"
 		to="https:" />
 
diff --git a/src/chrome/content/rules/Wamba.com.xml b/src/chrome/content/rules/Wamba.com.xml
index a22f50795f10..d3ce4c99e9bc 100644
--- a/src/chrome/content/rules/Wamba.com.xml
+++ b/src/chrome/content/rules/Wamba.com.xml
@@ -14,7 +14,6 @@
 
 	<rule from="^http:" to="https:" />
 
-	<test url="http://wamba.com/" />
 	<test url="http://www.wamba.com/" />
 	<test url="http://corp.wamba.com/" />
 	<test url="http://partner.wamba.com/" />
diff --git a/src/chrome/content/rules/Wandoujia.xml b/src/chrome/content/rules/Wandoujia.xml
index f1538d5a6db2..47b18eb1802d 100644
--- a/src/chrome/content/rules/Wandoujia.xml
+++ b/src/chrome/content/rules/Wandoujia.xml
@@ -36,7 +36,6 @@
 
 	<target host="apps.wandoujia.com" />
 	<exclusion pattern="^http://apps.wandoujia.com/(?!api/)" />
-		<test url="http://apps.wandoujia.com/" />
 		<test url="http://apps.wandoujia.com/tag/" />
 		<test url="http://apps.wandoujia.com/api/v1/apps?type=weeklytopgame" />
 
diff --git a/src/chrome/content/rules/Webtrekk.net.xml b/src/chrome/content/rules/Webtrekk.net.xml
index 22c811c2745d..383a504b84cb 100644
--- a/src/chrome/content/rules/Webtrekk.net.xml
+++ b/src/chrome/content/rules/Webtrekk.net.xml
@@ -37,7 +37,6 @@
 		<test url="http://flixbusweb01.wt-eu02.net/" />
 		<test url="http://fotoservicebenl01.wt-eu02.net/" />
 		<test url="http://fotoservicech01.wt-eu02.net/" />
-		<test url="http://responder.wt-safetag.com/" />
 
 		<!--	Sets cookie without Secure:
 							-->
diff --git a/src/chrome/content/rules/Wemfbox.ch.xml b/src/chrome/content/rules/Wemfbox.ch.xml
index 2b4db1058709..d39e5472b92f 100644
--- a/src/chrome/content/rules/Wemfbox.ch.xml
+++ b/src/chrome/content/rules/Wemfbox.ch.xml
@@ -3,6 +3,7 @@
 		- baz.wemfbox.ch
 		- actinnoc.wemfbox.ch
 		- annabe.wemfbox.ch
+		- argovia.wemfbox.ch
 		- aufemin.wemfbox.ch
 		- autoric.wemfbox.ch
 		- avguide.wemfbox.ch
@@ -154,13 +155,21 @@
 		- zsz.wemfbox.ch
 		- zuonline.wemfbox.ch
 
+	Timeout:
+		- 20minro-ssl.wemfbox.ch
+
+	Incomplete certificate chain:
+		- qs-ssl.wemfbox.ch
+
 		-->
 <ruleset name="wemfbox.ch (partial)">
 
 	<target host="www.wemfbox.ch" />
-	<target host="20minro-ssl.wemfbox.ch" />
+	<!-- target host="20minro-ssl.wemfbox.ch" / -->
 	<target host="arci-ssl.wemfbox.ch" />
 	<target host="arcinfo.wemfbox.ch" />
+	<target host="argovia.wemfbox.ch" />
+	<target host="argovia-ssl.wemfbox.ch" />
 	<target host="asct-ssl.wemfbox.ch" />
 	<target host="autosct.wemfbox.ch" />
 	<target host="baaonl-ssl.wemfbox.ch" />
@@ -234,7 +243,7 @@
 
 	<target host="pilatus-ssl.wemfbox.ch" />
 	<target host="qs.wemfbox.ch" />
-	<target host="qs-ssl.wemfbox.ch" />
+	<!-- target host="qs-ssl.wemfbox.ch" / -->
 
 	<target host="regione.wemfbox.ch" />
 	<target host="regione-ssl.wemfbox.ch" />
@@ -242,6 +251,7 @@
 
 	<target host="rro.wemfbox.ch" />
 	<target host="rro-ssl.wemfbox.ch" />
+	<target host="rtn.wemfbox.ch" />
 	<target host="rtn-ssl.wemfbox.ch" />
 
 	<target host="rts.wemfbox.ch" />
@@ -302,42 +312,7 @@
 	<securecookie host="^\.wemfbox\.ch$" name="^i00$" />
 	<securecookie host="^\w+-ssl\.wemfbox\.ch$" name=".+" />
 
-	<test url="http://arcinfo.wemfbox.ch/" />
-	<test url="http://autosct.wemfbox.ch/" />
-	<test url="http://chbauer.wemfbox.ch/" />
-	<test url="http://energyzh.wemfbox.ch/" />
-	<test url="http://finanzen.wemfbox.ch/" />
-	<test url="http://gmxch.wemfbox.ch/" />
-	<test url="http://golfs.wemfbox.ch/" />
-	<test url="http://hebdo.wemfbox.ch/" />
-	<test url="http://migmag.wemfbox.ch/" />
-	<test url="http://moneyh.wemfbox.ch/" />
-	<test url="http://newhome.wemfbox.ch/" />
-	<test url="http://netmx.wemfbox.ch/" />
-	<test url="http://tempslib.wemfbox.ch/" />
-	<test url="http://wetter.wemfbox.ch/" />
-
-	<test url="http://blickonl.wemfbox.ch/" /> 
-	<test url="http://cash.wemfbox.ch/" /> 
-	<test url="http://cinema.wemfbox.ch/" /> 
-	<test url="http://coop.wemfbox.ch/" /> 
-	<test url="http://coopz.wemfbox.ch/" /> 
-	<test url="http://fininfo.wemfbox.ch/" /> 
-	<test url="http://qs.wemfbox.ch/" /> 
-	<test url="http://nzz.wemfbox.ch/" /> 
-	<test url="http://regione.wemfbox.ch/" /> 
-	<test url="http://rro.wemfbox.ch/" /> 
-	<test url="http://rts.wemfbox.ch/" /> 
-	<test url="http://sbb.wemfbox.ch/" /> 
-	<test url="http://search.wemfbox.ch/" /> 
-	<test url="http://smilk.wemfbox.ch/" /> 
-	<test url="http://sportal.wemfbox.ch/" /> 
-	<test url="http://swissmom.wemfbox.ch/" /> 
-	<test url="http://teleboy.wemfbox.ch/" /> 
-	<test url="http://ticinonl.wemfbox.ch/" /> 
-	<test url="http://wildeis.wemfbox.ch/" /> 
-	<test url="http://woz.wemfbox.ch/" /> 
-	<test url="http://zip.wemfbox.ch/" /> 
+
 
 		<rule from="^http://arcinfo\.wemfbox\.ch/"
 		to="https://arci-ssl.wemfbox.ch/" />
@@ -381,7 +356,7 @@
 		<rule from="^http://wetter\.wemfbox\.ch/"
 		to="https://we-ssl.wemfbox.ch/" />
 
-		<rule from="^http://(argovia|blickonl|cash|cinema|coop|coopz|fininfo|qs|nzz|regione|rro|rtn|rts|sbb|search|smilk|sportal|swissmom|teleboy|ticinonl|wildeis|woz|zip)\.wemfbox\.ch/"
+		<rule from="^http://(argovia|blickonl|cash|cinema|coop|coopz|fininfo|nzz|regione|rro|rtn|rts|sbb|search|smilk|sportal|swissmom|teleboy|ticinonl|wildeis|woz|zip)\.wemfbox\.ch/"
 		to="https://$1-ssl.wemfbox.ch/" />
 
 	<rule from="^http:"
diff --git a/src/chrome/content/rules/Whirlpool.xml b/src/chrome/content/rules/Whirlpool.xml
index d3ac2f6be151..3d740b31d6d2 100644
--- a/src/chrome/content/rules/Whirlpool.xml
+++ b/src/chrome/content/rules/Whirlpool.xml
@@ -5,9 +5,6 @@
 	<target host="bc.whirlpool.net.au" />
 	<target host="forums.whirlpool.net.au" />
 
-    <test url="http://whirlpool.net.au/" />
-    <test url="http://forums.whirlpool.net.au/" />
-    <test url="http://bc.whirlpool.net.au/" />
 
 	<securecookie host="^\.whirlpool\.net\.au$" name=".+" />
 
diff --git a/src/chrome/content/rules/Wolverhampton.gov.uk.xml b/src/chrome/content/rules/Wolverhampton.gov.uk.xml
index a8e0d172b6c7..733caae05416 100644
--- a/src/chrome/content/rules/Wolverhampton.gov.uk.xml
+++ b/src/chrome/content/rules/Wolverhampton.gov.uk.xml
@@ -75,7 +75,6 @@
 					-->
 			<test url="http://m.wolverhampton.gov.uk/article/1165/Contact-form" />
 			<test url="http://m.wolverhampton.gov.uk/article/2614/Request-a-new-bin" />
-			<test url="http://m.wolverhampton.gov.uk/article/2614/Request-a-new-bin" />
 			<test url="http://m.wolverhampton.gov.uk/article/4771/Report-a-missed-bin" />
 			<test url="http://m.wolverhampton.gov.uk/article/5115/Website-feedback" />
 			<test url="http://m.wolverhampton.gov.uk/article/6/Login" />
diff --git a/src/chrome/content/rules/Zam.xml b/src/chrome/content/rules/Zam.xml
index ad93507ec483..359369a352ff 100644
--- a/src/chrome/content/rules/Zam.xml
+++ b/src/chrome/content/rules/Zam.xml
@@ -81,7 +81,6 @@
 	<test url="http://tu9srvbirvvtmtikbgf4ms1pyi5hzg54cy5jb200.g00.zam.com/" />
 	<test url="http://tu9srvbirvvtmtikbwf0y2gudgfib29sys5jb200.g00.zam.com/" />
 
-	<test url="http://lkimg.zamimg.com/" />
 	<test url="http://lkimg.zamimg.com/images/lkfish.png" />
 	<test url="http://lkimg.zamimg.com/images/v2/header/logo-text.png" />
 	<test url="http://lkimg.zamimg.com/images/v2/header/logo-urf-circle.png" />
diff --git a/src/chrome/content/rules/adsl.by.xml b/src/chrome/content/rules/adsl.by.xml
index 419a34d341e3..bbdb01c1d640 100644
--- a/src/chrome/content/rules/adsl.by.xml
+++ b/src/chrome/content/rules/adsl.by.xml
@@ -13,7 +13,6 @@ radio.adsl.by timed out
 	<rule from="^http://www\.adsl\.by/"
 		to="https://adsl.by/" />
 	
-	<test url="http://www.adsl.by/" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/amd-osx.com.xml b/src/chrome/content/rules/amd-osx.com.xml
index d5bfec7302a7..f0817aa595b3 100644
--- a/src/chrome/content/rules/amd-osx.com.xml
+++ b/src/chrome/content/rules/amd-osx.com.xml
@@ -5,9 +5,6 @@
 
 	<securecookie host="^([\w.-]+)\.amd-osx\.com$" name=".+" />
 
-	<test url="http://amd-osx.com/" />
-	<test url="http://www.amd-osx.com/" />
-	<test url="http://forum.amd-osx.com/" />
 	<test url="http://forum.amd-osx.com/search.php?search_id=active_topics" />
 	<test url="http://forum.amd-osx.com/memberlist.php?mode=contactadmin/" />
 
diff --git a/src/chrome/content/rules/bplaced.xml b/src/chrome/content/rules/bplaced.xml
index e652773c548e..101479eec8ce 100644
--- a/src/chrome/content/rules/bplaced.xml
+++ b/src/chrome/content/rules/bplaced.xml
@@ -15,7 +15,6 @@
 	<rule from="^http://bplaced\.net/"
 		to="https://www.bplaced.net/" />
 
-		<test url="http://www.bplaced.net/" />
 
 	<rule from="^http:"
 		to="https:" />
diff --git a/src/chrome/content/rules/cloud66.com.xml b/src/chrome/content/rules/cloud66.com.xml
index 804648104480..7211dea15ec1 100644
--- a/src/chrome/content/rules/cloud66.com.xml
+++ b/src/chrome/content/rules/cloud66.com.xml
@@ -6,20 +6,18 @@ realscale.cloud66.com mismatch
 status.cloud66.com mismatch
 uptime.cloud66.com timed out
 developers.cloud66.com timed out
-birdseye.cloud66.com mixed content font, image
+birdseye.cloud66.com mixed content font, image, expired
 help.cloud66.com mixed content image
 -->
 <ruleset name="cloud66.com">
 	<target host="cloud66.com" />
 	<target host="www.cloud66.com" />
 	<target host="app.cloud66.com" />
-	<target host="birdseye.cloud66.com" />
 	<target host="help.cloud66.com" />
 	
 	<rule from="^http://cloud66\.com/"
 		to="https://www.cloud66.com/" />
 
-	<test url="http://cloud66.com/" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/dellin.ru.xml b/src/chrome/content/rules/dellin.ru.xml
index dfcd8fac103f..3094904c1326 100644
--- a/src/chrome/content/rules/dellin.ru.xml
+++ b/src/chrome/content/rules/dellin.ru.xml
@@ -6,7 +6,6 @@
 	
 	<exclusion pattern="^http://m\.dellin\.ru/.*" />
 	
-	<test url="http://dellin.ru/" />
 	<test url="http://www.dellin.ru/" />
 	
 	<test url="http://m.dellin.ru/" />
diff --git a/src/chrome/content/rules/dosbox.xml b/src/chrome/content/rules/dosbox.xml
index 862ae1bfda4a..a582869c6bbc 100644
--- a/src/chrome/content/rules/dosbox.xml
+++ b/src/chrome/content/rules/dosbox.xml
@@ -5,11 +5,8 @@
 	<target host="www.vogons.org"/>
 	<target host="gkpatches.vogons.org"/>
 	<!--source.dosbox.com times out-->
-	<test url="http://www.dosbox.com/"/>
 	<test url="http://www.dosbox.com/download.php?main=1/"/>
 	<test url="http://www.dosbox.com/wiki/"/>
-	<test url="http://www.vogons.org/"/>
-	<test url="http://gkpatches.vogons.org/"/>
 	<securecookie host=".+" name=".+" />
 	<rule from="^http:" to="https:"/>
 </ruleset>
diff --git a/src/chrome/content/rules/espivblogs.net.xml b/src/chrome/content/rules/espivblogs.net.xml
index b9f75a253179..1eff042012a7 100644
--- a/src/chrome/content/rules/espivblogs.net.xml
+++ b/src/chrome/content/rules/espivblogs.net.xml
@@ -184,7 +184,6 @@
 			<test url="http://freedomtrekking.espivblogs.net/" />
 			<test url="http://immigrants-asoee.espivblogs.net/" />
 			<test url="http://insideout.espivblogs.net/" />
-			<test url="http://kaiussparilus.espivblogs.net/" />
 			<test url="http://katalipsi-virwnos-3.espivblogs.net/" />
 			<test url="http://katalipsianalipsis.espivblogs.net/" />
 			<test url="http://koinonikoiatreionfnx.espivblogs.net/" />
@@ -200,7 +199,6 @@
 			<test url="http://peiratikokafeneio.espivblogs.net/" />
 			<test url="http://proledialers.espivblogs.net/" />
 			<test url="http://prosfygika.espivblogs.net/" />
-			<test url="http://psalidi.espivblogs.net/" />
 			<test url="http://rioters.espivblogs.net/" />
 			<test url="http://saher.espivblogs.net/" />
 			<test url="http://sakana.espivblogs.net/" />
@@ -303,7 +301,6 @@
 		<test url="http://efimerida-oaed.espivblogs.net/" />
 		<test url="http://ekpaideysi.espivblogs.net/" />
 		<test url="http://eleftheriaki-strouga.espivblogs.net/" />
-		<test url="http://eleftheriako-giro-giro.espivblogs.net/" />
 		<test url="http://eleuantas.espivblogs.net/" />
 		<test url="http://elsxip.espivblogs.net/" />
 		<test url="http://epanoikeiopoiisi.espivblogs.net/" />
diff --git a/src/chrome/content/rules/greenhouseci.com.xml b/src/chrome/content/rules/greenhouseci.com.xml
index 07de2854dd71..3aa2a81e1423 100644
--- a/src/chrome/content/rules/greenhouseci.com.xml
+++ b/src/chrome/content/rules/greenhouseci.com.xml
@@ -2,16 +2,15 @@
 www.greenhouseci.com timed out
 blog.greenhouseci.com mismatch
 docs.greenhouseci.com mismatch
+app.greenhouseci.com mismatch
 -->
 <ruleset name="greenhouseci.com">
 	<target host="greenhouseci.com" />
 	<target host="www.greenhouseci.com" />
-	<target host="app.greenhouseci.com" />
 	
 	<rule from="^http://www\.greenhouseci\.com/"
 		to="https://greenhouseci.com/" />
 
-	<test url="http://www.greenhouseci.com/" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/juick.com.xml b/src/chrome/content/rules/juick.com.xml
index 31ddde2f4f14..dfc06146ba44 100644
--- a/src/chrome/content/rules/juick.com.xml
+++ b/src/chrome/content/rules/juick.com.xml
@@ -8,7 +8,6 @@ www.juick.com mismatch
 	<rule from="^http://www\.juick\.com/"
 		to="https://juick.com/" />
 	
-	<test url="http://www.juick.com/" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/luosimao.com.xml b/src/chrome/content/rules/luosimao.com.xml
index d8440c12b72c..9e2839f5b20c 100644
--- a/src/chrome/content/rules/luosimao.com.xml
+++ b/src/chrome/content/rules/luosimao.com.xml
@@ -18,7 +18,6 @@ Non-2xx HTTP code: http://my.luosimao.com/ (200) => https://my.luosimao.com/ (50
 		<test url="http://my.luosimao.com/auth/register" />
 	<!--	For Travis check error:	-->
 	<exclusion pattern="^http://my\.luosimao\.com/$" />
-		<test url="http://my.luosimao.com/" />
 	
 	<target host="s.luosimao.com" />
 		<test url="http://s.luosimao.com/bower/asset/website.css?v=201608181443.css" />
diff --git a/src/chrome/content/rules/netis.ru.xml b/src/chrome/content/rules/netis.ru.xml
index 95c96b6ea71c..78208ec66fdf 100644
--- a/src/chrome/content/rules/netis.ru.xml
+++ b/src/chrome/content/rules/netis.ru.xml
@@ -10,7 +10,6 @@ forum.netis.ru mismatch
 	<rule from="^http://netis\.ru/"
 		to="https://www.netis.ru/" />
 	
-	<test url="http://netis.ru/" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/squat.gr.xml b/src/chrome/content/rules/squat.gr.xml
deleted file mode 100644
index 9aa8595df2c5..000000000000
--- a/src/chrome/content/rules/squat.gr.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<!--
-	Problematic hosts in *squat.gr:
-
-		- delta.blogs ᵐ
-
-	ᵐ Mismatched
-
-
-	Insecure cookies are set for these hosts: ᶜ
-
-		- flying.squat.gr
-
-	ᶜ See https://owasp.org/index.php/SecureFlag
-
-
-	Mixed content:
-
-		- iframe on agrioskylo, antifakozanis, wxra from www.youtube.com ˢ
-
-		- Images, on:
-
-			- agrioskylo, anarxikoikavalas, antifasistikiartas, flaneurs, matsaggou, saspf, viaoutopiae from www.wpthemesarchive.com ⁴
-			- agropedia, anarxikoiaigaleo, anarxikoikavalas, anarxikospirinaspirea, antifasalonica, antifasistikiartas, antispe, antiviosi, autonomesologgi, autopoiesis, deathrockgreece, diskordia, ditiki, eldiarxeio, epf72, epieikwsflegon, erevos, ergaleioforos, eseioanninon, evagelismos, flying, huha, katalipsikeli, kiko, matsaggou, mewannadance, mpaksesmpaxes, namous, ntougrou, oktagwno, paapty, paliokylikeio, pararthma, pat61, pikpa, pikrodafni, propagandacollective, prwtovouliagriniou, radioguerilla, redblackplanet, realdemocracykavala, saspf, saxini3, sinelevsipolymorfikoy, solidarioszapatistas, stekiantipnoia, stekiedessas, viaoutopiae, villazografou, yabasta from $self ˢ
-			- anarxikoiaigaleo, antifakozanis, deathrockgreece, diskordia, realdemocracykavala from \d.bp.blogspot.com ˢ
-			- anarxikospirinaspireas from \d+.postimage.org ˢ
-			- antifakozanis from www.lifo.gr
-			- antifakozanis from www.newsit.gr ʳ
-			- antifakozanis, mewannadance, saxini3 from radio-i.org ʳ
-			- autopoiesis from upsidedownworld.org ᵐ
-			- baruti from parisvega.com ˢ
-			- delta from delta.blogs.squat.gr ᵐ
-			- diskordia from syneleysianarxikwnvolos.squat.gr ˢ
-			- diskordia from vividlife.me ʳ
-			- diskordia, mesaexo, pararthma from [^.]+.files.wordpress.com ˢ
-			- eldiarxeio from rf.resolvermaps.com ˢ
-			- epf72 from img\d+.imageshack.us ˢ
-			- eseioanninon, propagandacollective from xupolutotagma.squat.gr ˢ
-			- flaneurs from \d+.media.tumblr.com ˢ
-			- katalipsikeli from athens.indymedia.org ˢ
-			- kiko from www.larissablogs.gr
-			- mewannadance from 105fm.org
-			- mewannadance from www.1431am.org ˢ
-			- mewannadance from radiofragmata.espivblogs.net ˢ
-			- mewannadance from radio-revolt.net
-			- mewannadance from radioparasita.org ᵈ
-			- mewannadance from rebetiko.sealabs.net
-			- mpaxes from mpaksesmpaxes.squat.gr ˢ
-			- ntougrou from \d+.postimg.org ˢ
-			- paapty from sakana.espivblogs.net ˢ
-			- planet from \w+.squat.gr ˢ
-			- propagandacollective from www.autonomia.gr ⁴
-			- realdemocracykavala from t0.gstatic.com ˢ
-			- realdemocracykavala from www.k-tipos.gr ᵈ
-			- realdemocracykavala from www.kavalacity.net ᵖ
-			- realdemocracykavala from kourdistoportocali.com ᵐ
-			- stekiantipnoia from www.kinimatorama.net ˢ
-
-		- Ads / bugs, on:
-		
-			- anarxikoiaigaleo, apertus, ditiki, matsaggou from c.statcounter.com ˢ
-			- antifakozanis, fantasma from www.feedburner.com ˢ
-			- matsaggou, ntougrou from www.kinimatorama.net ˢ
-			- mewannadance from www.black-tracker.gr ⁴
-			- propagandacollective from i.creativecommons.org ˢ
-
-	⁴ Unsecurable <= 404
-	ᵈ Unsecurable <= dropped
-	ᵐ Not secured by us <= mismatched
-	ᵖ Unsecurable <= plaintext reply
-	ʳ Unsecurable <= refused
-	ˢ Secured by us, see https://www.paulirish.com/2010/the-protocol-relative-url/
-
--->
-<ruleset name="squat.gr (partial)">
-
-	<target host="squat.gr" />
-	<target host="*.squat.gr" />
-
-		<exclusion pattern="http://(?:[^./]+\.){2,}squat\.gr/" />
-
-			<test url="http://this.host.squat.gr/" />
-			<test url="http://exists.not.squat.gr/" />
-			<test url="http://delta.blogs.squat.gr/" />
-
-		<test url="http://adamasto.squat.gr/" />
-		<test url="http://agrioskylo.squat.gr/" />
-		<test url="http://agropedia.squat.gr/" />
-		<test url="http://agsofianorman.squat.gr/" />
-		<test url="http://akanthonas.squat.gr/" />
-		<test url="http://anarxikoiaigaleo.squat.gr/" />
-		<test url="http://anarxikoikavalas.squat.gr/" />
-		<test url="http://anarxikoilamias.squat.gr/" />
-		<test url="http://anarxikospirinaspirea.squat.gr/" />
-		<test url="http://anoixthsynelefsianarxikwn.squat.gr/" />
-		<test url="http://antiart.squat.gr/" />
-		<test url="http://antifakozanis.squat.gr/" />
-		<test url="http://antifasalonica.squat.gr/" />
-		<test url="http://antifasistikiartas.squat.gr/" />
-		<test url="http://antispe.squat.gr/" />
-		<test url="http://antiviosi.squat.gr/" />
-		<test url="http://apertus.squat.gr/" />
-		<test url="http://asisolidarity.squat.gr/" />
-		<test url="http://aspamak.squat.gr/" />
-		<test url="http://asta.squat.gr/" />
-		<test url="http://autonomesologgi.squat.gr/" />
-		<test url="http://autopoiesis.squat.gr/" />
-		<test url="http://baruti.squat.gr/" />
-		<test url="http://cumulonimbus.squat.gr/" />
-		<test url="http://deathrockgreece.squat.gr/" />
-		<test url="http://delta.squat.gr/" />
-		<test url="http://diskordia.squat.gr/" />
-		<test url="http://ditiki.squat.gr/" />
-		<test url="http://draka.squat.gr/" />
-		<test url="http://eaprokirikseis.squat.gr/" />
-		<test url="http://eldiarxeio.squat.gr/" />
-		<test url="http://epavlikouvelou.squat.gr/" />
-		<test url="http://epf72.squat.gr/" />
-		<test url="http://epieikwsflegon.squat.gr/" />
-		<test url="http://erevos.squat.gr/" />
-		<test url="http://ergaleioforos.squat.gr/" />
-		<test url="http://eseioanninon.squat.gr/" />
-		<test url="http://evagelismos.squat.gr/" />
-		<test url="http://fantasma.squat.gr/" />
-		<test url="http://flaneurs.squat.gr/" />
-		<test url="http://flying.squat.gr/" />
-		<test url="http://huha.squat.gr/" />
-		<test url="http://kakamantata.squat.gr/" />
-		<test url="http://kanaima.squat.gr/" />
-		<test url="http://karmaniola.squat.gr/" />
-		<test url="http://katalipsielaia.squat.gr/" />
-		<test url="http://katalipsikeli.squat.gr/" />
-		<test url="http://kiko.squat.gr/" />
-		<test url="http://klanification666.squat.gr/" />
-		<test url="http://koinostopos.squat.gr/" />
-		<test url="http://matsaggou.squat.gr/" />
-		<test url="http://mesaexo.squat.gr/" />
-		<test url="http://mewannadance.squat.gr/" />
-		<test url="http://mpaksesmpaxes.squat.gr/" />
-		<test url="http://mpaxes.squat.gr/" />
-		<test url="http://mplokonikaia.squat.gr/" />
-		<test url="http://mummrah.squat.gr/" />
-		<test url="http://mwvkafeneio.squat.gr/" />
-		<test url="http://namous.squat.gr/" />
-		<test url="http://nhma.squat.gr/" />
-		<test url="http://ntougrou.squat.gr/" />
-		<test url="http://oktagwno.squat.gr/" />
-		<test url="http://paapty.squat.gr/" />
-		<test url="http://paapty.squat.gr/" />
-		<test url="http://paliokylikeio.squat.gr/" />
-		<test url="http://pararthma.squat.gr/" />
-		<test url="http://paroksismos.squat.gr/" />
-		<test url="http://pat61.squat.gr/" />
-		<test url="http://pikpa.squat.gr/" />
-		<test url="http://pikrodafni.squat.gr/" />
-		<test url="http://planet.squat.gr/" />
-		<test url="http://propagandacollective.squat.gr/" />
-		<test url="http://prwtovouliagriniou.squat.gr/" />
-		<test url="http://radioguerilla.squat.gr/" />
-		<test url="http://radiourgia.squat.gr/" />
-		<test url="http://realdemocracykavala.squat.gr/" />
-		<test url="http://redblackplanet.squat.gr/" />
-		<test url="http://rosanera.squat.gr/" />
-		<test url="http://saspf.squat.gr/" />
-		<test url="http://saxini3.squat.gr/" />
-		<test url="http://senzaclassi.squat.gr/" />
-		<test url="http://sinelevsipolymorfikoy.squat.gr/" />
-		<test url="http://solidarioszapatistas.squat.gr/" />
-		<test url="http://spasmenogranazi.squat.gr/" />
-		<test url="http://stekiantipnoia.squat.gr/" />
-		<test url="http://stekiedessas.squat.gr/" />
-		<test url="http://stekiksanthis.squat.gr/" />
-		<test url="http://stekipolytexneiou.squat.gr/" />
-		<test url="http://stekistimodi.squat.gr/" />
-		<test url="http://studiofromthedown.squat.gr/" />
-		<test url="http://syneleysianarxikwnvolos.squat.gr/" />
-		<test url="http://syneleysikatoikwnvkp.squat.gr/" />
-		<test url="http://terraincognita.squat.gr/" />
-		<test url="http://theparabellum.squat.gr/" />
-		<test url="http://toubalibre.squat.gr/" />
-		<test url="http://viaoutopiae.squat.gr/" />
-		<test url="http://villazografou.squat.gr/" />
-		<test url="http://www.squat.gr/" />
-		<test url="http://wxra.squat.gr/" />
-		<test url="http://xupolutotagma.squat.gr/" />
-		<test url="http://yabasta.squat.gr/" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^flying\.squat\.gr$" name="^qtrans_front_language$" /-->
-
-	<securecookie host=".+" name=".+" />
-
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/tanx.com.xml b/src/chrome/content/rules/tanx.com.xml
index 5fb90a760a07..2bd0d3494d71 100644
--- a/src/chrome/content/rules/tanx.com.xml
+++ b/src/chrome/content/rules/tanx.com.xml
@@ -33,7 +33,6 @@
 	<target host="ets.tanx.com" />
 	
 	<target host="mu.tanx.com" />
-		<test url="http://mu.tanx.com/" />
 	<!--	MCB:	-->
 	<exclusion pattern="^http://mu\.tanx\.com/index\.htm" />
 		<test url="http://mu.tanx.com/index.htm" />
diff --git a/src/chrome/content/rules/tgstation13.org.xml b/src/chrome/content/rules/tgstation13.org.xml
index e5f56b084832..cab054fe8a76 100644
--- a/src/chrome/content/rules/tgstation13.org.xml
+++ b/src/chrome/content/rules/tgstation13.org.xml
@@ -4,8 +4,6 @@
 	<target host="status.tgstation13.org" />
 
 	<rule from="^http:" to="https:" />
-		<test url="http://tgstation13.org/" />
 		<test url="http://tgstation13.org/phpBB/" />
 		<test url="http://tgstation13.org/wiki/" />
-		<test url="http://status.tgstation13.org/" />
 </ruleset>
diff --git a/src/chrome/content/rules/vanguard.xml b/src/chrome/content/rules/vanguard.xml
index b1c6c6a2df19..b70b81c66463 100644
--- a/src/chrome/content/rules/vanguard.xml
+++ b/src/chrome/content/rules/vanguard.xml
@@ -4,9 +4,6 @@
   <target host="investor.vanguard.com" />
   <target host="personal.vanguard.com" />
 
-  <test url="http://vanguard.com/" />
-  <test url="http://investor.vanguard.com/" />
-  <test url="http://personal.vanguard.com/" />
 
   <rule from="^http:"
           to="https:" />
diff --git a/src/chrome/content/rules/voidtools.com.xml b/src/chrome/content/rules/voidtools.com.xml
index 43337dea0c65..8236767ee4f8 100644
--- a/src/chrome/content/rules/voidtools.com.xml
+++ b/src/chrome/content/rules/voidtools.com.xml
@@ -4,7 +4,6 @@
 
 	<target host="www.forum.voidtools.com"/>
 	<rule from="^http://www\.forum\.voidtools\.com/" to="https://www.voidtools.com/forum/" />
-		<test url="http://www.forum.voidtools.com/" />
 		
 	<!--	Directly	-->
 
diff --git a/src/chrome/content/rules/weburg.me.xml b/src/chrome/content/rules/weburg.me.xml
index a5f754c22d6d..d995e8125d66 100644
--- a/src/chrome/content/rules/weburg.me.xml
+++ b/src/chrome/content/rules/weburg.me.xml
@@ -15,7 +15,6 @@ passport.weburg.net mismatch
 	<rule from="^http://www\.weburg\.me/"
 		to="https://weburg.me/" />
 	
-	<test url="http://www.weburg.me/" />
 
 	<rule from="^http:" to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/westberks.gov.uk.xml b/src/chrome/content/rules/westberks.gov.uk.xml
index 118fd3264712..9b78ea1d7afd 100644
--- a/src/chrome/content/rules/westberks.gov.uk.xml
+++ b/src/chrome/content/rules/westberks.gov.uk.xml
@@ -86,7 +86,6 @@
 			<test url="http://westberks.gov.uk/index.aspx?articleid=30187" />
 			<test url="http://westberks.gov.uk/index.aspx?articleid=30263" />
 			<test url="http://westberks.gov.uk/index.aspx?articleid=31417" />
-			<test url="http://westberks.gov.uk/index.aspx?articleid=32455" />
 			<test url="http://westberks.gov.uk/newlogin" />
 
 			<!--	-ve:
@@ -104,7 +103,6 @@
 			<test url="http://westberks.gov.uk/index.aspx?articleid=29089" />
 			<test url="http://westberks.gov.uk/index.aspx?articleid=29609" />
 			<test url="http://westberks.gov.uk/index.aspx?articleid=31065" />
-			<test url="http://westberks.gov.uk/index.aspx?articleid=31065" />
 			<test url="http://westberks.gov.uk/index.aspx?articleid=32455" />
 			<test url="http://westberks.gov.uk/media/image/m/g/consumer_and_environmental_.png" />
 			<test url="http://westberks.gov.uk/service/assets/css/style.css" />
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
index 6ed1f1bbc184..3113046a7c27 100644
--- a/utils/ruleset-whitelist.csv
+++ b/utils/ruleset-whitelist.csv
@@ -1,4 +1,8 @@
 hash,auto-pass coverage test,auto-pass fetch test,filename
+274d8250863f1353526859ae21132138f2b7c29652d8c7e6c2b698a2504ad9f4,0,1,Fenland.gov.uk.xml
+5ea94d4f904b6afb84767bcf3a34ee6f91013b673284cf424d67eb09216a7b58,0,1,Wandoujia.xml
+916470a3d92b7d9b830a2d7276ee86f35b8f59de91dc9ba5b0d6bf2caed1d32f,0,1,luosimao.com.xml
+eba2548ed57c1957bdeb0b8f24da2d477e526e0cc00435edd5e2a32640c01754,0,1,tanx.com.xml
 fbb2d56d33f886b53c314eac3446eed8bad7916660ad0709367936fe8335d987,0,1,112_Cafe.com.xml
 43a7a917b89600c8dd3495359879ad1dfe468d9a478e63d5bbc6430a31cc41c2,1,1,123-reg.xml
 5b650e2b6084539440a1b66b5b45f5825a2d61db7812c7521e1a1e0860c4b6a3,1,1,16163.com.xml