diff --git a/core/test/data/blackbox/ean8-1/1.gif b/core/test/data/blackbox/ean8-1/1.gif
new file mode 100644
index 000000000..4dfc47e91
Binary files /dev/null and b/core/test/data/blackbox/ean8-1/1.gif differ
diff --git a/core/test/data/blackbox/ean8-1/1.url b/core/test/data/blackbox/ean8-1/1.url
deleted file mode 100644
index 6cb4a3d83..000000000
--- a/core/test/data/blackbox/ean8-1/1.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.gs1am.org/EAN8.gif
\ No newline at end of file
diff --git a/core/test/data/blackbox/ean8-1/2.gif b/core/test/data/blackbox/ean8-1/2.gif
new file mode 100644
index 000000000..869bc764b
Binary files /dev/null and b/core/test/data/blackbox/ean8-1/2.gif differ
diff --git a/core/test/data/blackbox/ean8-1/2.url b/core/test/data/blackbox/ean8-1/2.url
deleted file mode 100644
index de4b52c22..000000000
--- a/core/test/data/blackbox/ean8-1/2.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.activebarcode.com/images/codes/200x125/ean8.gif
\ No newline at end of file
diff --git a/core/test/data/blackbox/ean8-1/3.gif b/core/test/data/blackbox/ean8-1/3.gif
new file mode 100644
index 000000000..82853b286
Binary files /dev/null and b/core/test/data/blackbox/ean8-1/3.gif differ
diff --git a/core/test/data/blackbox/ean8-1/3.url b/core/test/data/blackbox/ean8-1/3.url
deleted file mode 100644
index 0778d0316..000000000
--- a/core/test/data/blackbox/ean8-1/3.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.scanlink.co.za/images_faq/ean8.gif
\ No newline at end of file
diff --git a/core/test/data/blackbox/ean8-1/4.jpg b/core/test/data/blackbox/ean8-1/4.jpg
new file mode 100644
index 000000000..620bf20ee
Binary files /dev/null and b/core/test/data/blackbox/ean8-1/4.jpg differ
diff --git a/core/test/data/blackbox/ean8-1/4.url b/core/test/data/blackbox/ean8-1/4.url
deleted file mode 100644
index 0637569df..000000000
--- a/core/test/data/blackbox/ean8-1/4.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.nextoffice.net/linux/barcode2.jpg
\ No newline at end of file
diff --git a/core/test/data/blackbox/ean8-1/5.gif b/core/test/data/blackbox/ean8-1/5.gif
new file mode 100644
index 000000000..5fe3210dd
Binary files /dev/null and b/core/test/data/blackbox/ean8-1/5.gif differ
diff --git a/core/test/data/blackbox/ean8-1/5.url b/core/test/data/blackbox/ean8-1/5.url
deleted file mode 100644
index 5c2fdc392..000000000
--- a/core/test/data/blackbox/ean8-1/5.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.indicod-ecr.it/prodottiservizi/images/ceu02b.gif
\ No newline at end of file
diff --git a/core/test/data/blackbox/ean8-1/6.jpg b/core/test/data/blackbox/ean8-1/6.jpg
new file mode 100644
index 000000000..540ca0e1e
Binary files /dev/null and b/core/test/data/blackbox/ean8-1/6.jpg differ
diff --git a/core/test/data/blackbox/ean8-1/6.url b/core/test/data/blackbox/ean8-1/6.url
deleted file mode 100644
index 741ccfa95..000000000
--- a/core/test/data/blackbox/ean8-1/6.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.selmar.pl/images_menus_big/431/453607ba29d0a/kody_kreskowe_ean8.jpg
\ No newline at end of file
diff --git a/core/test/data/blackbox/ean8-1/7.jpg b/core/test/data/blackbox/ean8-1/7.jpg
new file mode 100644
index 000000000..de7d0c688
Binary files /dev/null and b/core/test/data/blackbox/ean8-1/7.jpg differ
diff --git a/core/test/data/blackbox/ean8-1/7.url b/core/test/data/blackbox/ean8-1/7.url
deleted file mode 100644
index 4c0520757..000000000
--- a/core/test/data/blackbox/ean8-1/7.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.softeksoftware.co.uk/images/barcode_ean8.jpg
\ No newline at end of file
diff --git a/core/test/data/blackbox/ean8-1/8.gif b/core/test/data/blackbox/ean8-1/8.gif
new file mode 100644
index 000000000..cd26cb357
Binary files /dev/null and b/core/test/data/blackbox/ean8-1/8.gif differ
diff --git a/core/test/data/blackbox/ean8-1/8.url b/core/test/data/blackbox/ean8-1/8.url
deleted file mode 100644
index 1c99f57be..000000000
--- a/core/test/data/blackbox/ean8-1/8.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.barcodeisland.com/ean8-1.gif
\ No newline at end of file
diff --git a/core/test/data/blackbox/upce-1/1.gif b/core/test/data/blackbox/upce-1/1.gif
new file mode 100644
index 000000000..484048113
Binary files /dev/null and b/core/test/data/blackbox/upce-1/1.gif differ
diff --git a/core/test/data/blackbox/upce-1/1.url b/core/test/data/blackbox/upce-1/1.url
deleted file mode 100644
index 4d29ae0d1..000000000
--- a/core/test/data/blackbox/upce-1/1.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.ciax.com/manuals/ref/images/upce_1.gif
\ No newline at end of file
diff --git a/core/test/data/blackbox/upce-1/2.gif b/core/test/data/blackbox/upce-1/2.gif
new file mode 100644
index 000000000..ee3e42e15
Binary files /dev/null and b/core/test/data/blackbox/upce-1/2.gif differ
diff --git a/core/test/data/blackbox/upce-1/2.url b/core/test/data/blackbox/upce-1/2.url
deleted file mode 100644
index 768105304..000000000
--- a/core/test/data/blackbox/upce-1/2.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.gs1.org/images/barcodes/UPC_E.gif
\ No newline at end of file
diff --git a/core/test/data/blackbox/upce-1/4.jpg b/core/test/data/blackbox/upce-1/4.jpg
new file mode 100644
index 000000000..11e651576
Binary files /dev/null and b/core/test/data/blackbox/upce-1/4.jpg differ
diff --git a/core/test/data/blackbox/upce-1/4.url b/core/test/data/blackbox/upce-1/4.url
deleted file mode 100644
index dcd914de8..000000000
--- a/core/test/data/blackbox/upce-1/4.url
+++ /dev/null
@@ -1 +0,0 @@
-http://www.varlink.co.uk/Images/gls_upcE.jpg
\ No newline at end of file