diff --git a/webroot/test/config.php b/webroot/test/config.php
new file mode 100644
index 0000000..a8c3f78
--- /dev/null
+++ b/webroot/test/config.php
@@ -0,0 +1,8 @@
+<?php
+// Use error reporting
+error_reporting(-1);
+ini_set('display_errors', 1);
+
+
+// The link to img.php
+$imgphp = "../img.php?src=";
diff --git a/webroot/test/template.php b/webroot/test/template.php
new file mode 100644
index 0000000..d3ef35b
--- /dev/null
+++ b/webroot/test/template.php
@@ -0,0 +1,101 @@
+<!doctype html>
+<head>
+  <meta charset='utf-8'/>
+  <title><?=$title?></title>
+  <style>
+  body {background-color: #ccc;}
+  </style>
+  <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
+
+<script type="text/javascript">
+window.getDetails = function (url, id) {
+  $.getJSON(url, function(data) {
+    element = document.getElementById(id);
+    element.innerHTML = "width: " + data.width + "\nheigh: " + data.height + "\naspect-ratio: " + data.aspectRatio;
+  });  
+}
+</script>
+
+</head>
+<body>
+<h1><?=$title?></h1>
+
+<?php if (isset($description)) : ?>
+<p><?=$description?></p>
+<?php endif; ?>
+
+<h2>Images used in test</h2>
+
+<p>The following images are used for this test.</p>
+
+<?php foreach($images as $image) : ?>
+  <p>
+    <code>
+      <a href="img/<?=$image?>"><?=$image?></a> 
+      <a href="<?=$imgphp . $image . '&json'?>">(json)</a>
+      <a href="<?=$imgphp . $image . '&verbose'?>">(verbose)</a>
+    </code>
+    <br>
+  <img src="<?=$imgphp . $image?>"></p>
+  <p></p>
+
+<pre id="<?=$image?>"></pre>
+<script type="text/javascript">window.getDetails("<?=$imgphp . $image . '&json'?>", "<?=$image?>")</script>
+
+<?php endforeach; ?>
+
+
+
+<h2>Testcases used for each image</h2>
+
+<p>The following testcases are used for each image.</p>
+
+<?php foreach($testcase as $tc) : ?>
+  <code><?=$tc?></code><br>
+<?php endforeach; ?>
+
+
+
+<h2>For each image, apply all testcases</h2>
+
+<?php 
+$ch1 = 1;
+foreach($images as $image) :
+?>
+<h3><?=$ch1?>. Using source image <?=$image?></h3>
+
+<p>
+  <code>
+    <a href="img/<?=$image?>"><?=$image?></a> 
+    <a href="<?=$imgphp . $image . '&json'?>">(json)</a>
+    <a href="<?=$imgphp . $image . '&verbose'?>">(verbose)</a>
+  </code>
+  <br>
+  <img src="<?=$imgphp . $image?>">
+</p>
+
+<pre id="<?=$ch1?>"></pre>
+<script type="text/javascript">window.getDetails("<?=$imgphp . $image . '&json'?>", "<?=$ch1?>")</script>
+
+<?php 
+$ch2 = 1;
+foreach($testcase as $tc) : 
+$tcId = "$ch1.$ch2";
+?>
+<h4>Testcase <?=$tcId?>: <?=$tc?></h4>
+
+<p>
+  <code>
+    <a href="<?=$imgphp . $image . $tc?>"><?=$image . $tc?></a> 
+    <a href="<?=$imgphp . $image . $tc . '&json'?>">(json)</a>
+    <a href="<?=$imgphp . $image . $tc . '&verbose'?>">(verbose)</a>
+  </code>
+  <br>
+  <img src="<?=$imgphp . $image . $tc?>">
+</p>
+
+<pre id="<?=$tcId?>"></pre>
+<script type="text/javascript">window.getDetails("<?=$imgphp . $image . $tc . '&json'?>", "<?=$tcId?>")</script>
+
+<?php $ch2++; endforeach; ?>
+<?php $ch1++; endforeach; ?>
diff --git a/webroot/test/test_issue29.php b/webroot/test/test_issue29.php
index 54d00df..af1518c 100644
--- a/webroot/test/test_issue29.php
+++ b/webroot/test/test_issue29.php
@@ -1,75 +1,38 @@
-<!doctype html>
-<head>
-  <meta charset='utf-8'/>
-  <title>Testing img for issue 29</title>
-  <style>
-  body {background-color: #ccc;}
-  </style>
-</head>
-<body>
-<h1>Testing issue 29</h1>
-
 <?php
-error_reporting(-1);              // Report all type of errors
-ini_set('display_errors', 1);     // Display all errors 
-ini_set('output_buffering', 0);   // Do not buffer outputs, write directly
+// Include config for all testcases
+include __DIR__ . "/config.php";
 
-echo "<p>Version of PHP is: " . phpversion();
 
-$imgphp = "../img.php?src=";
 
+// The title of the test case
+$title = "Testing img for issue 29";
+
+
+
+// Provide a short description of the testcase.
+$description = "";
+
+
+
+// Use these images in the test
 $images = array(
-  'issue29/400x265.jpg',
-  'issue29/400x268.jpg',
-  'issue29/400x300.jpg',
-  'issue29/465x304.jpg',
-  'issue29/640x273.jpg',
+    'issue29/400x265.jpg',
+    'issue29/400x268.jpg',
+    'issue29/400x300.jpg',
+    'issue29/465x304.jpg',
+    'issue29/640x273.jpg',
 );
 
 
+
+// For each image, apply these testcases 
 $testcase = array(
-  '&w=300&cf&q=80&nc',
-  '&w=75&h=75&cf&q=80&nc',
-  '&w=75&h=75&q=80',
+    '&w=300&cf&q=80&nc',
+    '&w=75&h=75&cf&q=80&nc',
+    '&w=75&h=75&q=80',
 );
-?>
-
-
-<h2>Images used in test</h2>
-
-<p>The following images are used for this test.</p>
-
-<?php foreach($images as $image) : ?>
-  <p><code><a href="img/<?=$image?>"><?=$image?></a></code><br>
-  <img src="<?=$imgphp . $image?>"></p>
-<?php endforeach; ?>
 
 
 
-<h2>Testcases used for each image</h2>
-
-<p>The following testcases are used for each image.</p>
-
-<?php foreach($testcase as $tc) : ?>
-  <code><?=$tc?></code><br>
-<?php endforeach; ?>
-
-
-
-<h2>Applying testcase for each image</h2>
-
-<?php foreach($images as $image) : ?>
-<h3><?=$image?></h3>
-
-<p><code><a href="img/<?=$image?>"><?=$image?></a></code><br>
-<img src="<?=$imgphp . $image?>"></p>
-
-<?php foreach($testcase as $tc) : ?>
-<h4><?=$tc?></h4>
-
-<p><code><a href="<?=$imgphp . $image . $tc?>"><?=$image . $tc?></a></code><br>
-<img src="<?=$imgphp . $image . $tc?>"></p>
-
-<?php endforeach; ?>
-<?php endforeach; ?>
-
+// Applu testcases and present results
+include __DIR__ . "/template.php";
diff --git a/webroot/test/test_issue36_aro.php b/webroot/test/test_issue36_aro.php
index 969d9fc..953023f 100644
--- a/webroot/test/test_issue36_aro.php
+++ b/webroot/test/test_issue36_aro.php
@@ -1,77 +1,42 @@
-<!doctype html>
-<head>
-  <meta charset='utf-8'/>
-  <title>Testing img for issue 36 - autoRotate</title>
-  <style>
-  body {background-color: #ccc;}
-  </style>
-</head>
-<body>
-<h1>Testing issue 36 - autoRotate</h1>
-
 <?php
-error_reporting(-1);              // Report all type of errors
-ini_set('display_errors', 1);     // Display all errors 
-ini_set('output_buffering', 0);   // Do not buffer outputs, write directly
+// Include config for all testcases
+include __DIR__ . "/config.php";
 
-$imgphp = "../img.php?src=";
 
+
+// The title of the test case
+$title = "Testing issue 36 - autoRotate";
+
+
+
+// Provide a short description of the testcase.
+$description = "";
+
+
+
+// Use these images in the test
 $images = array(
-  'issue36/me-0.jpg',
-  'issue36/me-90.jpg',
-  'issue36/me-180.jpg',
-  'issue36/me-270.jpg',
-  'issue36/flower-0.jpg',
-  'issue36/flower-90.jpg',
-  'issue36/flower-180.jpg',
-  'issue36/flower-270.jpg',
+    'issue36/me-0.jpg',
+    'issue36/me-90.jpg',
+    'issue36/me-180.jpg',
+    'issue36/me-270.jpg',
+    'issue36/flower-0.jpg',
+    'issue36/flower-90.jpg',
+    'issue36/flower-180.jpg',
+    'issue36/flower-270.jpg',
 );
 
 
+
+// For each image, apply these testcases 
 $testcase = array(
-  '&aro&nc',
-  '&aro&nc&w=200',
-  '&aro&nc&h=200',
-  '&aro&nc&w=200&h=200&cf',
+    '&aro&nc',
+    '&aro&nc&w=200',
+    '&aro&nc&h=200',
+    '&aro&nc&w=200&h=200&cf',
 );
-?>
-
-
-<h2>Images used in test</h2>
-
-<p>The following images are used for this test.</p>
-
-<?php foreach($images as $image) : ?>
-  <p><code><a href="img/<?=$image?>"><?=$image?></a></code><br>
-  <img src="<?=$imgphp . $image?>"></p>
-<?php endforeach; ?>
 
 
 
-<h2>Testcases used for each image</h2>
-
-<p>The following testcases are used for each image.</p>
-
-<?php foreach($testcase as $tc) : ?>
-  <code><?=$tc?></code><br>
-<?php endforeach; ?>
-
-
-
-<h2>Applying testcase for each image</h2>
-
-<?php foreach($images as $image) : ?>
-<h3><?=$image?></h3>
-
-<p><code><a href="img/<?=$image?>"><?=$image?></a></code><br>
-<img src="<?=$imgphp . $image?>"></p>
-
-<?php foreach($testcase as $tc) : ?>
-<h4><?=$tc?></h4>
-
-<p><code><a href="<?=$imgphp . $image . $tc?>"><?=$image . $tc?></a></code><br>
-<img src="<?=$imgphp . $image . $tc?>"></p>
-
-<?php endforeach; ?>
-<?php endforeach; ?>
-
+// Applu testcases and present results
+include __DIR__ . "/template.php";
diff --git a/webroot/test/test_issue36_rb-ra-180.php b/webroot/test/test_issue36_rb-ra-180.php
index 8e6b305..9cb0be3 100644
--- a/webroot/test/test_issue36_rb-ra-180.php
+++ b/webroot/test/test_issue36_rb-ra-180.php
@@ -1,76 +1,42 @@
 <?php
+// Include config for all testcases
+include __DIR__ . "/config.php";
+
+
+
+// The title of the test case
 $angle = 180;
-?><!doctype html>
-<head>
-  <meta charset='utf-8'/>
-  <title>Testing img for issue 36 - rotateBefore, rotateAfter <?=$angle?></title>
-  <style>
-  body {background-color: #ccc;}
-  </style>
-</head>
-<body>
-<h1>Testing issue 36 - rotateBefore, rotateAfter <?=$angle?></h1>
 
-<?php
-error_reporting(-1);              // Report all type of errors
-ini_set('display_errors', 1);     // Display all errors
-ini_set('output_buffering', 0);   // Do not buffer outputs, write directly
+$title = "Testing img for issue 36 - rotateBefore, rotateAfter <?=$angle?>";
 
-$imgphp = "../img.php?src=";
 
+
+// Provide a short description of the testcase.
+$description = "";
+
+
+
+// Use these images in the test
 $images = array(
-  'kodim08.png',
-  'kodim04.png',
+    'kodim08.png',
+    'kodim04.png',
 );
 
+
+
+// For each image, apply these testcases 
 $testcase = array(
-  "&rb=$angle&nc",
-  "&rb=$angle&nc&w=200",
-  "&rb=$angle&nc&h=200",
-  "&rb=$angle&nc&w=200&h=200&cf",
-  "&ra=$angle&nc",
-  "&ra=$angle&nc&w=200",
-  "&ra=$angle&nc&h=200",
-  "&ra=$angle&nc&w=200&h=200&cf",
+    "&rb=$angle&nc",
+    "&rb=$angle&nc&w=200",
+    "&rb=$angle&nc&h=200",
+    "&rb=$angle&nc&w=200&h=200&cf",
+    "&ra=$angle&nc",
+    "&ra=$angle&nc&w=200",
+    "&ra=$angle&nc&h=200",
+    "&ra=$angle&nc&w=200&h=200&cf",
 );
-?>
-
-
-<h2>Images used in test</h2>
-
-<p>The following images are used for this test.</p>
-
-<?php foreach($images as $image) : ?>
-  <p><code><a href="img/<?=$image?>"><?=$image?></a></code><br>
-  <img src="<?=$imgphp . $image?>"></p>
-<?php endforeach; ?>
 
 
 
-<h2>Testcases used for each image</h2>
-
-<p>The following testcases are used for each image.</p>
-
-<?php foreach($testcase as $tc) : ?>
-  <code><?=$tc?></code><br>
-<?php endforeach; ?>
-
-
-
-<h2>Applying testcase for each image</h2>
-
-<?php foreach($images as $image) : ?>
-<h3><?=$image?></h3>
-
-<p><code><a href="img/<?=$image?>"><?=$image?></a></code><br>
-<img src="<?=$imgphp . $image?>"></p>
-
-<?php foreach($testcase as $tc) : ?>
-<h4><?=$tc?></h4>
-
-<p><code><a href="<?=$imgphp . $image . $tc?>"><?=$image . $tc?></a></code><br>
-<img src="<?=$imgphp . $image . $tc?>"></p>
-
-<?php endforeach; ?>
-<?php endforeach; ?>
-
+// Apply testcases and present results
+include __DIR__ . "/template.php";
diff --git a/webroot/test/test_issue36_rb-ra-270.php b/webroot/test/test_issue36_rb-ra-270.php
index e3d07ba..93d671f 100644
--- a/webroot/test/test_issue36_rb-ra-270.php
+++ b/webroot/test/test_issue36_rb-ra-270.php
@@ -1,76 +1,42 @@
 <?php
+// Include config for all testcases
+include __DIR__ . "/config.php";
+
+
+
+// The title of the test case
 $angle = 270;
-?><!doctype html>
-<head>
-  <meta charset='utf-8'/>
-  <title>Testing img for issue 36 - rotateBefore, rotateAfter <?=$angle?></title>
-  <style>
-  body {background-color: #ccc;}
-  </style>
-</head>
-<body>
-<h1>Testing issue 36 - rotateBefore, rotateAfter <?=$angle?></h1>
 
-<?php
-error_reporting(-1);              // Report all type of errors
-ini_set('display_errors', 1);     // Display all errors 
-ini_set('output_buffering', 0);   // Do not buffer outputs, write directly
+$title = "Testing img for issue 36 - rotateBefore, rotateAfter <?=$angle?>";
 
-$imgphp = "../img.php?src=";
 
+
+// Provide a short description of the testcase.
+$description = "";
+
+
+
+// Use these images in the test
 $images = array(
-  'kodim08.png',
-  'kodim04.png',
+    'kodim08.png',
+    'kodim04.png',
 );
 
+
+
+// For each image, apply these testcases 
 $testcase = array(
-  "&rb=$angle&nc",
-  "&rb=$angle&nc&w=200",
-  "&rb=$angle&nc&h=200",
-  "&rb=$angle&nc&w=200&h=200&cf",
-  "&ra=$angle&nc",
-  "&ra=$angle&nc&w=200",
-  "&ra=$angle&nc&h=200",
-  "&ra=$angle&nc&w=200&h=200&cf",
+    "&rb=$angle&nc",
+    "&rb=$angle&nc&w=200",
+    "&rb=$angle&nc&h=200",
+    "&rb=$angle&nc&w=200&h=200&cf",
+    "&ra=$angle&nc",
+    "&ra=$angle&nc&w=200",
+    "&ra=$angle&nc&h=200",
+    "&ra=$angle&nc&w=200&h=200&cf",
 );
-?>
-
-
-<h2>Images used in test</h2>
-
-<p>The following images are used for this test.</p>
-
-<?php foreach($images as $image) : ?>
-  <p><code><a href="img/<?=$image?>"><?=$image?></a></code><br>
-  <img src="<?=$imgphp . $image?>"></p>
-<?php endforeach; ?>
 
 
 
-<h2>Testcases used for each image</h2>
-
-<p>The following testcases are used for each image.</p>
-
-<?php foreach($testcase as $tc) : ?>
-  <code><?=$tc?></code><br>
-<?php endforeach; ?>
-
-
-
-<h2>Applying testcase for each image</h2>
-
-<?php foreach($images as $image) : ?>
-<h3><?=$image?></h3>
-
-<p><code><a href="img/<?=$image?>"><?=$image?></a></code><br>
-<img src="<?=$imgphp . $image?>"></p>
-
-<?php foreach($testcase as $tc) : ?>
-<h4><?=$tc?></h4>
-
-<p><code><a href="<?=$imgphp . $image . $tc?>"><?=$image . $tc?></a></code><br>
-<img src="<?=$imgphp . $image . $tc?>"></p>
-
-<?php endforeach; ?>
-<?php endforeach; ?>
-
+// Apply testcases and present results
+include __DIR__ . "/template.php";
diff --git a/webroot/test/test_issue36_rb-ra-45.php b/webroot/test/test_issue36_rb-ra-45.php
index a75dce8..381b4ac 100644
--- a/webroot/test/test_issue36_rb-ra-45.php
+++ b/webroot/test/test_issue36_rb-ra-45.php
@@ -1,78 +1,42 @@
 <?php
+// Include config for all testcases
+include __DIR__ . "/config.php";
+
+
+
+// The title of the test case
 $angle = 45;
-?><!doctype html>
-<head>
-  <meta charset='utf-8'/>
-  <title>Testing img for issue 36 - rotateBefore, rotateAfter <?=$angle?></title>
-  <style>
-  body {background-color: #ccc;}
-  </style>
-</head>
-<body>
-<h1>Testing issue 36 - rotateBefore, rotateAfter <?=$angle?></h1>
 
-<?php
-error_reporting(-1);              // Report all type of errors
-ini_set('display_errors', 1);     // Display all errors 
-ini_set('output_buffering', 0);   // Do not buffer outputs, write directly
+$title = "Testing img for issue 36 - rotateBefore, rotateAfter <?=$angle?>";
 
-$imgphp = "../img.php?src=";
 
+
+// Provide a short description of the testcase.
+$description = "";
+
+
+
+// Use these images in the test
 $images = array(
-  'kodim08.png',
-  'kodim04.png',
+    'kodim08.png',
+    'kodim04.png',
 );
 
+
+
+// For each image, apply these testcases 
 $testcase = array(
-  "&rb=$angle&bgc=ffffff&nc",
-  "&rb=$angle&bgc=ffffff&nc&w=200",
-  "&rb=$angle&bgc=ffffff&nc&h=200",
-  "&rb=$angle&bgc=ffffff&nc&w=200&h=200&cf",
-  "&rb=$angle&bgc=ffffff&nc&w=200&h=200&cf&crop=200,200,center,center",
-  "&ra=$angle&bgc=ffffff&nc",
-  "&ra=$angle&bgc=ffffff&nc&w=200",
-  "&ra=$angle&bgc=ffffff&nc&h=200",
-  "&ra=$angle&bgc=ffffff&nc&w=200&h=200&cf",
-  "&ra=$angle&bgc=ffffff&nc&w=200&h=200&cf&crop=200,200,center,center",
+    "&rb=$angle&nc",
+    "&rb=$angle&nc&w=200",
+    "&rb=$angle&nc&h=200",
+    "&rb=$angle&nc&w=200&h=200&cf",
+    "&ra=$angle&nc",
+    "&ra=$angle&nc&w=200",
+    "&ra=$angle&nc&h=200",
+    "&ra=$angle&nc&w=200&h=200&cf",
 );
-?>
-
-
-<h2>Images used in test</h2>
-
-<p>The following images are used for this test.</p>
-
-<?php foreach($images as $image) : ?>
-  <p><code><a href="img/<?=$image?>"><?=$image?></a></code><br>
-  <img src="<?=$imgphp . $image?>"></p>
-<?php endforeach; ?>
 
 
 
-<h2>Testcases used for each image</h2>
-
-<p>The following testcases are used for each image.</p>
-
-<?php foreach($testcase as $tc) : ?>
-  <code><?=$tc?></code><br>
-<?php endforeach; ?>
-
-
-
-<h2>Applying testcase for each image</h2>
-
-<?php foreach($images as $image) : ?>
-<h3><?=$image?></h3>
-
-<p><code><a href="img/<?=$image?>"><?=$image?></a></code><br>
-<img src="<?=$imgphp . $image?>"></p>
-
-<?php foreach($testcase as $tc) : ?>
-<h4><?=$tc?></h4>
-
-<p><code><a href="<?=$imgphp . $image . $tc?>"><?=$image . $tc?></a></code><br>
-<img src="<?=$imgphp . $image . $tc?>"></p>
-
-<?php endforeach; ?>
-<?php endforeach; ?>
-
+// Apply testcases and present results
+include __DIR__ . "/template.php";
diff --git a/webroot/test/test_issue36_rb-ra-90.php b/webroot/test/test_issue36_rb-ra-90.php
index 3dce95f..a559064 100644
--- a/webroot/test/test_issue36_rb-ra-90.php
+++ b/webroot/test/test_issue36_rb-ra-90.php
@@ -1,76 +1,42 @@
 <?php
+// Include config for all testcases
+include __DIR__ . "/config.php";
+
+
+
+// The title of the test case
 $angle = 90;
-?><!doctype html>
-<head>
-  <meta charset='utf-8'/>
-  <title>Testing img for issue 36 - rotateBefore, rotateAfter <?=$angle?></title>
-  <style>
-  body {background-color: #ccc;}
-  </style>
-</head>
-<body>
-<h1>Testing issue 36 - rotateBefore, rotateAfter <?=$angle?></h1>
 
-<?php
-error_reporting(-1);              // Report all type of errors
-ini_set('display_errors', 1);     // Display all errors 
-ini_set('output_buffering', 0);   // Do not buffer outputs, write directly
+$title = "Testing img for issue 36 - rotateBefore, rotateAfter <?=$angle?>";
 
-$imgphp = "../img.php?src=";
 
+
+// Provide a short description of the testcase.
+$description = "";
+
+
+
+// Use these images in the test
 $images = array(
-  'kodim08.png',
-  'kodim04.png',
+    'kodim08.png',
+    'kodim04.png',
 );
 
+
+
+// For each image, apply these testcases 
 $testcase = array(
-  "&rb=$angle&nc",
-  "&rb=$angle&nc&w=200",
-  "&rb=$angle&nc&h=200",
-  "&rb=$angle&nc&w=200&h=200&cf",
-  "&ra=$angle&nc",
-  "&ra=$angle&nc&w=200",
-  "&ra=$angle&nc&h=200",
-  "&ra=$angle&nc&w=200&h=200&cf",
+    "&rb=$angle&nc",
+    "&rb=$angle&nc&w=200",
+    "&rb=$angle&nc&h=200",
+    "&rb=$angle&nc&w=200&h=200&cf",
+    "&ra=$angle&nc",
+    "&ra=$angle&nc&w=200",
+    "&ra=$angle&nc&h=200",
+    "&ra=$angle&nc&w=200&h=200&cf",
 );
-?>
-
-
-<h2>Images used in test</h2>
-
-<p>The following images are used for this test.</p>
-
-<?php foreach($images as $image) : ?>
-  <p><code><a href="img/<?=$image?>"><?=$image?></a></code><br>
-  <img src="<?=$imgphp . $image?>"></p>
-<?php endforeach; ?>
 
 
 
-<h2>Testcases used for each image</h2>
-
-<p>The following testcases are used for each image.</p>
-
-<?php foreach($testcase as $tc) : ?>
-  <code><?=$tc?></code><br>
-<?php endforeach; ?>
-
-
-
-<h2>Applying testcase for each image</h2>
-
-<?php foreach($images as $image) : ?>
-<h3><?=$image?></h3>
-
-<p><code><a href="img/<?=$image?>"><?=$image?></a></code><br>
-<img src="<?=$imgphp . $image?>"></p>
-
-<?php foreach($testcase as $tc) : ?>
-<h4><?=$tc?></h4>
-
-<p><code><a href="<?=$imgphp . $image . $tc?>"><?=$image . $tc?></a></code><br>
-<img src="<?=$imgphp . $image . $tc?>"></p>
-
-<?php endforeach; ?>
-<?php endforeach; ?>
-
+// Applu testcases and present results
+include __DIR__ . "/template.php";
diff --git a/webroot/test/test_issue40.php b/webroot/test/test_issue40.php
index 75216c9..4f598f3 100644
--- a/webroot/test/test_issue40.php
+++ b/webroot/test/test_issue40.php
@@ -1,120 +1,37 @@
-<!doctype html>
-<head>
-  <meta charset='utf-8'/>
-  <title>Testing img for issue 40 - no ratio</title>
-  <style>
-  body {background-color: #ccc;}
-  </style>
-  <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-
-<script type="text/javascript">
-window.getDetails = function (url, id) {
-  $.getJSON(url, function(data) {
-    element = document.getElementById(id);
-    element.innerHTML = "width: " + data.width + "\nheigh: " + data.height + "\naspect-ratio: " + data.aspectRatio;
-  });  
-}
-</script>
-
-</head>
-<body>
-<h1>Testing issue 40 - no ratio</h1>
-
 <?php
-error_reporting(-1);              // Report all type of errors
-ini_set('display_errors', 1);     // Display all errors 
+// Include config for all testcases
+include __DIR__ . "/config.php";
 
-$imgphp = "../img.php?src=";
 
+
+// The title of the test case
+$title = "Testing issue 40 - no ratio";
+
+
+
+// Provide a short description of the testcase.
+$description = "Showing off how to resize image with and without ratio.";
+
+
+
+// Use these images in the test
 $images = array(
-  'issue40/source.jpg',
+    'issue40/source.jpg',
 );
 
 
+
+// For each image, apply these testcases 
 $testcase = array(
-  '&nc&width=652&height=466',
-  '&nc&width=652&height=466&no-ratio',
-  '&nc&width=652&height=466&crop-to-fit',
-  '&nc&width=652&aspect-ratio=1.4',
-  '&nc&width=652&aspect-ratio=1.4&no-ratio',
-  '&nc&width=652&aspect-ratio=1.4&crop-to-fit',
+    '&nc&width=652&height=466',
+    '&nc&width=652&height=466&no-ratio',
+    '&nc&width=652&height=466&crop-to-fit',
+    '&nc&width=652&aspect-ratio=1.4',
+    '&nc&width=652&aspect-ratio=1.4&no-ratio',
+    '&nc&width=652&aspect-ratio=1.4&crop-to-fit',
 );
-?>
-
-
-<h2>Images used in test</h2>
-
-<p>The following images are used for this test.</p>
-
-<?php foreach($images as $image) : ?>
-  <p>
-    <code>
-      <a href="img/<?=$image?>"><?=$image?></a> 
-      <a href="<?=$imgphp . $image . '&json'?>">(json)</a>
-      <a href="<?=$imgphp . $image . '&verbose'?>">(verbose)</a>
-    </code>
-    <br>
-  <img src="<?=$imgphp . $image?>"></p>
-  <p></p>
-
-<pre id="<?=$image?>"></pre>
-<script type="text/javascript">window.getDetails("<?=$imgphp . $image . '&json'?>", "<?=$image?>")</script>
-
-<?php endforeach; ?>
 
 
 
-<h2>Testcases used for each image</h2>
-
-<p>The following testcases are used for each image.</p>
-
-<?php foreach($testcase as $tc) : ?>
-  <code><?=$tc?></code><br>
-<?php endforeach; ?>
-
-
-
-<h2>Applying testcase for each image</h2>
-
-<?php 
-$ch1 = 1;
-foreach($images as $image) :
-?>
-<h3><?=$ch1?>. Using source image <?=$image?></h3>
-
-<p>
-  <code>
-    <a href="img/<?=$image?>"><?=$image?></a> 
-    <a href="<?=$imgphp . $image . '&json'?>">(json)</a>
-    <a href="<?=$imgphp . $image . '&verbose'?>">(verbose)</a>
-  </code>
-  <br>
-  <img src="<?=$imgphp . $image?>">
-</p>
-
-<pre id="<?=$ch1?>"></pre>
-<script type="text/javascript">window.getDetails("<?=$imgphp . $image . '&json'?>", "<?=$ch1?>")</script>
-
-<?php 
-$ch2 = 1;
-foreach($testcase as $tc) : 
-$tcId = "$ch1.$ch2";
-?>
-<h4>Testcase <?=$tcId?>: <?=$tc?></h4>
-
-<p>
-  <code>
-    <a href="<?=$imgphp . $image . $tc?>"><?=$image . $tc?></a> 
-    <a href="<?=$imgphp . $image . $tc . '&json'?>">(json)</a>
-    <a href="<?=$imgphp . $image . $tc . '&verbose'?>">(verbose)</a>
-  </code>
-  <br>
-  <img src="<?=$imgphp . $image . $tc?>">
-</p>
-
-<pre id="<?=$tcId?>"></pre>
-<script type="text/javascript">window.getDetails("<?=$imgphp . $image . $tc . '&json'?>", "<?=$tcId?>")</script>
-
-<?php $ch2++; endforeach; ?>
-<?php $ch1++; endforeach; ?>
-
+// Apply testcases and present results
+include __DIR__ . "/template.php";
