diff --git a/.gitignore b/.gitignore
index ec1055155..4481e1fc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 target/
 .idea/
 *.iml
+test/xspec/*
+tutorial/xspec/*
+test/result.log
diff --git a/test/xspec.bats b/test/xspec.bats
index 30bc147e8..ee1b89983 100644
--- a/test/xspec.bats
+++ b/test/xspec.bats
@@ -17,6 +17,18 @@
 #
 #===============================================================================
 
+setup() {
+	mkdir ../tutorial/xspec
+	mkdir ../test/xspec
+}
+
+
+teardown() {
+	rm -rf ../tutorial/xspec
+	rm -rf ../test/xspec
+}
+
+
 @test "invoking xspec without arguments prints usage" {
     run ../bin/xspec.sh
 	echo $output
@@ -70,13 +82,12 @@
 }
 
 
-# this test must run first to create xspec directory
 @test "invoking code coverage with Saxon9EE creates test stylesheet" {
     export SAXON_CP=/path/to/saxon9ee.jar
     run ../bin/xspec.sh -c ../tutorial/escape-for-regex.xspec
   	echo $output
     [ "$status" -eq 1 ]
-    [ "${lines[2]}" = "Creating Test Stylesheet..." ]
+    [ "${lines[1]}" = "Creating Test Stylesheet..." ]
 }
 
 
@@ -96,6 +107,7 @@
     [ "$status" -eq 0 ]
 }
 
+
 @test "invoking xspec generates HTML report file" {
     run ../bin/xspec.sh ../tutorial/escape-for-regex.xspec
     run stat ../tutorial/xspec/escape-for-regex-result.html
@@ -103,6 +115,7 @@
     [ "$status" -eq 0 ]
 }
 
+
 @test "invoking xspec with -j option with Saxon8 returns error message" {
     export SAXON_CP=/path/to/saxon8.jar
     run ../bin/xspec.sh -j ../tutorial/escape-for-regex.xspec
@@ -128,6 +141,7 @@
     [ "${lines[18]}" = "Report available at ../tutorial/xspec/escape-for-regex-junit.xml" ]
 }
 
+
 @test "invoking xspec with -j option generates XML report file" {
     run ../bin/xspec.sh -j ../tutorial/escape-for-regex.xspec
     run stat ../tutorial/xspec/escape-for-regex-result.xml
@@ -135,6 +149,7 @@
     [ "$status" -eq 0 ]
 }
 
+
 @test "invoking xspec with -j option generates JUnit report file" {
     run ../bin/xspec.sh -j ../tutorial/escape-for-regex.xspec
     run stat ../tutorial/xspec/escape-for-regex-junit.xml
diff --git a/test/xspec/xspec-junit-result.html b/test/xspec/xspec-junit-result.html
deleted file mode 100644
index a04179e56..000000000
--- a/test/xspec/xspec-junit-result.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><html xmlns:test="http://www.jenitennison.com/xslt/unit-test" xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Test Report for home/sandro/Documents/programming/github/cirulls/xspec/src/reporter/junit-report.xsl (3/0/0/3)</title>
-      <link rel="stylesheet" type="text/css" href="file:/home/sandro/Documents/programming/github/cirulls/xspec/src/reporter/test-report.css" />
-   </head>
-   <body>
-      <h1>Test Report</h1>
-      <p>Stylesheet: <a href="file:/home/sandro/Documents/programming/github/cirulls/xspec/src/reporter/junit-report.xsl">home/sandro/Documents/programming/github/cirulls/xspec/src/reporter/junit-report.xsl</a></p>
-      <p>Tested: 17 August 2016 at 20:23</p>
-      <h2>Contents</h2>
-      <table class="xspec">
-         <col width="85%" />
-         <col width="15%" />
-         <thead>
-            <tr>
-               <th style="text-align: right; font-weight: normal; ">passed/pending/failed/total</th>
-               <th>3/0/0/3</th>
-            </tr>
-         </thead>
-         <tbody>
-            <tr class="successful">
-               <th><a href="#d3e4">When processing a successful test</a></th>
-               <th>1/0/0/1</th>
-            </tr>
-            <tr class="successful">
-               <th><a href="#d3e52">When processing a failing test</a></th>
-               <th>1/0/0/1</th>
-            </tr>
-            <tr class="successful">
-               <th><a href="#d3e112">When processing successful and failing tests</a></th>
-               <th>1/0/0/1</th>
-            </tr>
-         </tbody>
-      </table>
-      <div id="d3e4">
-         <h2 class="successful">When processing a successful test<span class="scenario-totals">1/0/0/1</span></h2>
-         <table class="xspec" id="t-d3e4">
-            <col width="85%" />
-            <col width="15%" />
-            <tbody>
-               <tr class="successful">
-                  <th>When processing a successful test</th>
-                  <th>1/0/0/1</th>
-               </tr>
-               <tr class="successful">
-                  <td>convert it to test case with status passed</td>
-                  <td>Success</td>
-               </tr>
-            </tbody>
-         </table>
-      </div>
-      <div id="d3e52">
-         <h2 class="successful">When processing a failing test<span class="scenario-totals">1/0/0/1</span></h2>
-         <table class="xspec" id="t-d3e52">
-            <col width="85%" />
-            <col width="15%" />
-            <tbody>
-               <tr class="successful">
-                  <th>When processing a failing test</th>
-                  <th>1/0/0/1</th>
-               </tr>
-               <tr class="successful">
-                  <td>convert it to test case with status failed</td>
-                  <td>Success</td>
-               </tr>
-            </tbody>
-         </table>
-      </div>
-      <div id="d3e112">
-         <h2 class="successful">When processing successful and failing tests<span class="scenario-totals">1/0/0/1</span></h2>
-         <table class="xspec" id="t-d3e112">
-            <col width="85%" />
-            <col width="15%" />
-            <tbody>
-               <tr class="successful">
-                  <th>When processing successful and failing tests</th>
-                  <th>1/0/0/1</th>
-               </tr>
-               <tr class="successful">
-                  <td>convert it to test cases with status passed and failing</td>
-                  <td>Success</td>
-               </tr>
-            </tbody>
-         </table>
-      </div>
-   </body>
-</html>
\ No newline at end of file
diff --git a/test/xspec/xspec-junit-result.xml b/test/xspec/xspec-junit-result.xml
deleted file mode 100644
index 0cb32eb3e..000000000
--- a/test/xspec/xspec-junit-result.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="file:/home/sandro/Documents/programming/github/cirulls/xspec/src/compiler/format-xspec-report.xsl"?>
-<x:report xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-          xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          xmlns:test="http://www.jenitennison.com/xslt/unit-test"
-          xmlns:x="http://www.jenitennison.com/xslt/xspec"
-          stylesheet="file:/home/sandro/Documents/programming/github/cirulls/xspec/src/reporter/junit-report.xsl"
-          date="2016-08-17T20:23:05.17+01:00">
-   <x:scenario>
-      <x:label>When processing a successful test</x:label>
-      <x:context>
-         <x:test successful="true">
-            <x:label>Successful test</x:label>
-            <x:result>
-               <p>Foo</p>
-            </x:result>
-            <x:expect>
-               <p>Foo</p>
-            </x:expect>
-         </x:test>
-      </x:context>
-      <x:result>
-         <testcase name="Successful test" status="passed"/>
-      </x:result>
-      <x:test successful="true">
-         <x:label>convert it to test case with status passed</x:label>
-         <x:result>
-            <testcase name="Successful test" status="passed"/>
-         </x:result>
-         <x:expect>
-            <testcase name="Successful test" status="passed"/>
-         </x:expect>
-      </x:test>
-   </x:scenario>
-   <x:scenario>
-      <x:label>When processing a failing test</x:label>
-      <x:context>
-         <x:test successful="false">
-            <x:label>failing test</x:label>
-            <x:result>
-               <p>Foo</p>
-            </x:result>
-            <x:expect>
-               <p>Bar</p>
-            </x:expect>
-         </x:test>
-      </x:context>
-      <x:result>
-         <testcase name="failing test" status="failed">
-            <failure message="expect assertion failed">&lt;x:expect xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:test="http://www.jenitennison.com/xslt/unit-test" xmlns:x="http://www.jenitennison.com/xslt/xspec"&gt;&lt;p&gt;Bar&lt;/p&gt;&lt;/x:expect&gt;</failure>
-         </testcase>
-      </x:result>
-      <x:test successful="true">
-         <x:label>convert it to test case with status failed</x:label>
-         <x:result>
-            <testcase name="failing test" status="failed">
-               <failure message="expect assertion failed">&lt;x:expect xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:test="http://www.jenitennison.com/xslt/unit-test" xmlns:x="http://www.jenitennison.com/xslt/xspec"&gt;&lt;p&gt;Bar&lt;/p&gt;&lt;/x:expect&gt;</failure>
-            </testcase>
-         </x:result>
-         <x:expect>
-            <testcase name="failing test" status="failed">
-               <failure message="expect assertion failed">&lt;x:expect xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:test="http://www.jenitennison.com/xslt/unit-test" xmlns:x="http://www.jenitennison.com/xslt/xspec"&gt;&lt;p&gt;Bar&lt;/p&gt;&lt;/x:expect&gt;</failure>
-            </testcase>
-         </x:expect>
-      </x:test>
-   </x:scenario>
-   <x:scenario>
-      <x:label>When processing successful and failing tests</x:label>
-      <x:context>
-         <x:test successful="true">
-            <x:label>Successful test</x:label>
-            <x:result>
-               <p>Foo</p>
-            </x:result>
-            <x:expect>
-               <p>Foo</p>
-            </x:expect>
-         </x:test>
-         <x:test successful="false">
-            <x:label>Failing test</x:label>
-            <x:result>
-               <p>Foo</p>
-            </x:result>
-            <x:expect>
-               <p>Bar</p>
-            </x:expect>
-         </x:test>
-      </x:context>
-      <x:result>
-         <testcase name="Successful test" status="passed"/>
-         <testcase name="Failing test" status="failed">
-            <failure message="expect assertion failed">&lt;x:expect xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:test="http://www.jenitennison.com/xslt/unit-test" xmlns:x="http://www.jenitennison.com/xslt/xspec"&gt;&lt;p&gt;Bar&lt;/p&gt;&lt;/x:expect&gt;</failure>
-         </testcase>
-      </x:result>
-      <x:test successful="true">
-         <x:label>convert it to test cases with status passed and failing</x:label>
-         <x:result>
-            <testcase name="Successful test" status="passed"/>
-            <testcase name="Failing test" status="failed">
-               <failure message="expect assertion failed">&lt;x:expect xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:test="http://www.jenitennison.com/xslt/unit-test" xmlns:x="http://www.jenitennison.com/xslt/xspec"&gt;&lt;p&gt;Bar&lt;/p&gt;&lt;/x:expect&gt;</failure>
-            </testcase>
-         </x:result>
-         <x:expect>
-            <testcase name="Successful test" status="passed"/>
-            <testcase name="Failing test" status="failed">
-               <failure message="expect assertion failed">&lt;x:expect xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:test="http://www.jenitennison.com/xslt/unit-test" xmlns:x="http://www.jenitennison.com/xslt/xspec"&gt;&lt;p&gt;Bar&lt;/p&gt;&lt;/x:expect&gt;</failure>
-            </testcase>
-         </x:expect>
-      </x:test>
-   </x:scenario>
-</x:report>
diff --git a/test/xspec/xspec-junit.xsl b/test/xspec/xspec-junit.xsl
deleted file mode 100644
index 1ab81b0c9..000000000
--- a/test/xspec/xspec-junit.xsl
+++ /dev/null
@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:test="http://www.jenitennison.com/xslt/unit-test"
-                xmlns:x="http://www.jenitennison.com/xslt/xspec"
-                xmlns:__x="http://www.w3.org/1999/XSL/TransformAliasAlias"
-                xmlns:pkg="http://expath.org/ns/pkg"
-                xmlns:impl="urn:x-xspec:compile:xslt:impl"
-                version="3.0"
-                exclude-result-prefixes="pkg impl">
-   <xsl:import href="file:/home/sandro/Documents/programming/github/cirulls/xspec/src/reporter/junit-report.xsl"/>
-   <xsl:import href="file:/home/sandro/Documents/programming/github/cirulls/xspec/src/compiler/generate-tests-utils.xsl"/>
-   <xsl:namespace-alias stylesheet-prefix="__x" result-prefix="xsl"/>
-   <xsl:variable name="x:stylesheet-uri"
-                 as="xs:string"
-                 select="'file:/home/sandro/Documents/programming/github/cirulls/xspec/src/reporter/junit-report.xsl'"/>
-   <xsl:output name="x:report" method="xml" indent="yes"/>
-   <xsl:template name="x:main">
-      <xsl:message>
-         <xsl:text>Testing with </xsl:text>
-         <xsl:value-of select="system-property('xsl:product-name')"/>
-         <xsl:text> </xsl:text>
-         <xsl:value-of select="system-property('xsl:product-version')"/>
-      </xsl:message>
-      <xsl:result-document format="x:report">
-         <xsl:processing-instruction name="xml-stylesheet">type="text/xsl" href="file:/home/sandro/Documents/programming/github/cirulls/xspec/src/compiler/format-xspec-report.xsl"</xsl:processing-instruction>
-         <x:report stylesheet="{$x:stylesheet-uri}" date="{current-dateTime()}">
-            <xsl:call-template name="x:d5e2"/>
-            <xsl:call-template name="x:d5e15"/>
-            <xsl:call-template name="x:d5e30"/>
-         </x:report>
-      </xsl:result-document>
-   </xsl:template>
-   <xsl:template name="x:d5e2">
-      <xsl:message>When processing a successful test</xsl:message>
-      <x:scenario>
-         <x:label>When processing a successful test</x:label>
-         <x:context>
-            <x:test successful="true">
-               <x:label>
-                  <xsl:text>Successful test</xsl:text>
-               </x:label>
-               <x:result>
-                  <p>
-                     <xsl:text>Foo</xsl:text>
-                  </p>
-               </x:result>
-               <x:expect>
-                  <p>
-                     <xsl:text>Foo</xsl:text>
-                  </p>
-               </x:expect>
-            </x:test>
-         </x:context>
-         <xsl:variable name="x:result" as="item()*">
-            <xsl:variable name="impl:context-doc" as="document-node()">
-               <xsl:document>
-                  <x:test successful="true">
-                     <x:label>
-                        <xsl:text>Successful test</xsl:text>
-                     </x:label>
-                     <x:result>
-                        <p>
-                           <xsl:text>Foo</xsl:text>
-                        </p>
-                     </x:result>
-                     <x:expect>
-                        <p>
-                           <xsl:text>Foo</xsl:text>
-                        </p>
-                     </x:expect>
-                  </x:test>
-               </xsl:document>
-            </xsl:variable>
-            <xsl:variable name="impl:context" select="$impl:context-doc/node()"/>
-            <xsl:apply-templates select="$impl:context"/>
-         </xsl:variable>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$x:result"/>
-            <xsl:with-param name="wrapper-name" select="'x:result'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-         <xsl:call-template name="x:d5e13">
-            <xsl:with-param name="x:result" select="$x:result"/>
-         </xsl:call-template>
-      </x:scenario>
-   </xsl:template>
-   <xsl:template name="x:d5e13">
-      <xsl:param name="x:result" required="yes"/>
-      <xsl:message>convert it to test case with status passed</xsl:message>
-      <xsl:variable name="impl:with-context"
-                    select="                          exists($x:result) and empty($x:result[2])"/>
-      <xsl:variable name="impl:context" as="item()?">
-         <xsl:choose>
-            <xsl:when test="$impl:with-context">
-               <xsl:sequence select="$x:result"/>
-            </xsl:when>
-            <xsl:otherwise/>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="impl:expected-doc" as="document-node()">
-         <xsl:document>
-            <testcase name="Successful test" status="passed"/>
-         </xsl:document>
-      </xsl:variable>
-      <xsl:variable name="impl:expected" select="$impl:expected-doc/node()"/>
-      <xsl:variable name="impl:successful"
-                    as="xs:boolean"
-                    select="                    test:deep-equal(                      $impl:expected,                      if ( $impl:with-context ) then $impl:context else $x:result,                      3)"/>
-      <xsl:if test="not($impl:successful)">
-         <xsl:message>      FAILED</xsl:message>
-      </xsl:if>
-      <x:test successful="{ $impl:successful }">
-         <x:label>convert it to test case with status passed</x:label>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$x:result"/>
-            <xsl:with-param name="wrapper-name" select="'x:result'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$impl:expected"/>
-            <xsl:with-param name="wrapper-name" select="'x:expect'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-      </x:test>
-   </xsl:template>
-   <xsl:template name="x:d5e15">
-      <xsl:message>When processing a failing test</xsl:message>
-      <x:scenario>
-         <x:label>When processing a failing test</x:label>
-         <x:context>
-            <x:test successful="false">
-               <x:label>
-                  <xsl:text>failing test</xsl:text>
-               </x:label>
-               <x:result>
-                  <p>
-                     <xsl:text>Foo</xsl:text>
-                  </p>
-               </x:result>
-               <x:expect>
-                  <p>
-                     <xsl:text>Bar</xsl:text>
-                  </p>
-               </x:expect>
-            </x:test>
-         </x:context>
-         <xsl:variable name="x:result" as="item()*">
-            <xsl:variable name="impl:context-doc" as="document-node()">
-               <xsl:document>
-                  <x:test successful="false">
-                     <x:label>
-                        <xsl:text>failing test</xsl:text>
-                     </x:label>
-                     <x:result>
-                        <p>
-                           <xsl:text>Foo</xsl:text>
-                        </p>
-                     </x:result>
-                     <x:expect>
-                        <p>
-                           <xsl:text>Bar</xsl:text>
-                        </p>
-                     </x:expect>
-                  </x:test>
-               </xsl:document>
-            </xsl:variable>
-            <xsl:variable name="impl:context" select="$impl:context-doc/node()"/>
-            <xsl:apply-templates select="$impl:context"/>
-         </xsl:variable>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$x:result"/>
-            <xsl:with-param name="wrapper-name" select="'x:result'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-         <xsl:call-template name="x:d5e26">
-            <xsl:with-param name="x:result" select="$x:result"/>
-         </xsl:call-template>
-      </x:scenario>
-   </xsl:template>
-   <xsl:template name="x:d5e26">
-      <xsl:param name="x:result" required="yes"/>
-      <xsl:message>convert it to test case with status failed</xsl:message>
-      <xsl:variable name="impl:with-context"
-                    select="                          exists($x:result) and empty($x:result[2])"/>
-      <xsl:variable name="impl:context" as="item()?">
-         <xsl:choose>
-            <xsl:when test="$impl:with-context">
-               <xsl:sequence select="$x:result"/>
-            </xsl:when>
-            <xsl:otherwise/>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="impl:expected-doc" as="document-node()">
-         <xsl:document>
-            <testcase name="failing test" status="failed">
-               <failure message="expect assertion failed">
-                  <xsl:text>&lt;x:expect xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:test="http://www.jenitennison.com/xslt/unit-test" xmlns:x="http://www.jenitennison.com/xslt/xspec"&gt;&lt;p&gt;Bar&lt;/p&gt;&lt;/x:expect&gt;</xsl:text>
-               </failure>
-            </testcase>
-         </xsl:document>
-      </xsl:variable>
-      <xsl:variable name="impl:expected" select="$impl:expected-doc/node()"/>
-      <xsl:variable name="impl:successful"
-                    as="xs:boolean"
-                    select="                    test:deep-equal(                      $impl:expected,                      if ( $impl:with-context ) then $impl:context else $x:result,                      3)"/>
-      <xsl:if test="not($impl:successful)">
-         <xsl:message>      FAILED</xsl:message>
-      </xsl:if>
-      <x:test successful="{ $impl:successful }">
-         <x:label>convert it to test case with status failed</x:label>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$x:result"/>
-            <xsl:with-param name="wrapper-name" select="'x:result'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$impl:expected"/>
-            <xsl:with-param name="wrapper-name" select="'x:expect'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-      </x:test>
-   </xsl:template>
-   <xsl:template name="x:d5e30">
-      <xsl:message>When processing successful and failing tests</xsl:message>
-      <x:scenario>
-         <x:label>When processing successful and failing tests</x:label>
-         <x:context>
-            <x:test successful="true">
-               <x:label>
-                  <xsl:text>Successful test</xsl:text>
-               </x:label>
-               <x:result>
-                  <p>
-                     <xsl:text>Foo</xsl:text>
-                  </p>
-               </x:result>
-               <x:expect>
-                  <p>
-                     <xsl:text>Foo</xsl:text>
-                  </p>
-               </x:expect>
-            </x:test>
-            <x:test successful="false">
-               <x:label>
-                  <xsl:text>Failing test</xsl:text>
-               </x:label>
-               <x:result>
-                  <p>
-                     <xsl:text>Foo</xsl:text>
-                  </p>
-               </x:result>
-               <x:expect>
-                  <p>
-                     <xsl:text>Bar</xsl:text>
-                  </p>
-               </x:expect>
-            </x:test>
-         </x:context>
-         <xsl:variable name="x:result" as="item()*">
-            <xsl:variable name="impl:context-doc" as="document-node()">
-               <xsl:document>
-                  <x:test successful="true">
-                     <x:label>
-                        <xsl:text>Successful test</xsl:text>
-                     </x:label>
-                     <x:result>
-                        <p>
-                           <xsl:text>Foo</xsl:text>
-                        </p>
-                     </x:result>
-                     <x:expect>
-                        <p>
-                           <xsl:text>Foo</xsl:text>
-                        </p>
-                     </x:expect>
-                  </x:test>
-                  <x:test successful="false">
-                     <x:label>
-                        <xsl:text>Failing test</xsl:text>
-                     </x:label>
-                     <x:result>
-                        <p>
-                           <xsl:text>Foo</xsl:text>
-                        </p>
-                     </x:result>
-                     <x:expect>
-                        <p>
-                           <xsl:text>Bar</xsl:text>
-                        </p>
-                     </x:expect>
-                  </x:test>
-               </xsl:document>
-            </xsl:variable>
-            <xsl:variable name="impl:context" select="$impl:context-doc/node()"/>
-            <xsl:apply-templates select="$impl:context"/>
-         </xsl:variable>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$x:result"/>
-            <xsl:with-param name="wrapper-name" select="'x:result'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-         <xsl:call-template name="x:d5e50">
-            <xsl:with-param name="x:result" select="$x:result"/>
-         </xsl:call-template>
-      </x:scenario>
-   </xsl:template>
-   <xsl:template name="x:d5e50">
-      <xsl:param name="x:result" required="yes"/>
-      <xsl:message>convert it to test cases with status passed and failing</xsl:message>
-      <xsl:variable name="impl:with-context"
-                    select="                          exists($x:result) and empty($x:result[2])"/>
-      <xsl:variable name="impl:context" as="item()?">
-         <xsl:choose>
-            <xsl:when test="$impl:with-context">
-               <xsl:sequence select="$x:result"/>
-            </xsl:when>
-            <xsl:otherwise/>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="impl:expected-doc" as="document-node()">
-         <xsl:document>
-            <testcase name="Successful test" status="passed"/>
-            <testcase name="Failing test" status="failed">
-               <failure message="expect assertion failed">
-                  <xsl:text>&lt;x:expect xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:test="http://www.jenitennison.com/xslt/unit-test" xmlns:x="http://www.jenitennison.com/xslt/xspec"&gt;&lt;p&gt;Bar&lt;/p&gt;&lt;/x:expect&gt;</xsl:text>
-               </failure>
-            </testcase>
-         </xsl:document>
-      </xsl:variable>
-      <xsl:variable name="impl:expected" select="$impl:expected-doc/node()"/>
-      <xsl:variable name="impl:successful"
-                    as="xs:boolean"
-                    select="                    test:deep-equal(                      $impl:expected,                      if ( $impl:with-context ) then $impl:context else $x:result,                      3)"/>
-      <xsl:if test="not($impl:successful)">
-         <xsl:message>      FAILED</xsl:message>
-      </xsl:if>
-      <x:test successful="{ $impl:successful }">
-         <x:label>convert it to test cases with status passed and failing</x:label>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$x:result"/>
-            <xsl:with-param name="wrapper-name" select="'x:result'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$impl:expected"/>
-            <xsl:with-param name="wrapper-name" select="'x:expect'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-      </x:test>
-   </xsl:template>
-</xsl:stylesheet>
diff --git a/test/xspec/xspec-variable-result.html b/test/xspec/xspec-variable-result.html
deleted file mode 100644
index 4eef2b2bd..000000000
--- a/test/xspec/xspec-variable-result.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><html xmlns:test="http://www.jenitennison.com/xslt/unit-test" xmlns="http://www.w3.org/1999/xhtml">
-   <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>Test Report for home/sandro/Documents/programming/github/cirulls/xspec/test/xspec-tested.xsl (4/0/0/4)</title>
-      <link rel="stylesheet" type="text/css" href="file:/home/sandro/Documents/programming/github/cirulls/xspec/src/reporter/test-report.css" />
-   </head>
-   <body>
-      <h1>Test Report</h1>
-      <p>Stylesheet: <a href="file:/home/sandro/Documents/programming/github/cirulls/xspec/test/xspec-tested.xsl">home/sandro/Documents/programming/github/cirulls/xspec/test/xspec-tested.xsl</a></p>
-      <p>Tested: 11 August 2016 at 23:20</p>
-      <h2>Contents</h2>
-      <table class="xspec">
-         <col width="85%" />
-         <col width="15%" />
-         <thead>
-            <tr>
-               <th style="text-align: right; font-weight: normal; ">passed/pending/failed/total</th>
-               <th>4/0/0/4</th>
-            </tr>
-         </thead>
-         <tbody>
-            <tr class="successful">
-               <th><a href="#d3e4">call global var</a></th>
-               <th>2/0/0/2</th>
-            </tr>
-            <tr class="successful">
-               <th><a href="#d3e33">call local var</a></th>
-               <th>2/0/0/2</th>
-            </tr>
-         </tbody>
-      </table>
-      <div id="d3e4">
-         <h2 class="successful">call global var<span class="scenario-totals">2/0/0/2</span></h2>
-         <table class="xspec" id="t-d3e4">
-            <col width="85%" />
-            <col width="15%" />
-            <tbody>
-               <tr class="successful">
-                  <th>call global var</th>
-                  <th>2/0/0/2</th>
-               </tr>
-               <tr class="successful">
-                  <td>the result</td>
-                  <td>Success</td>
-               </tr>
-               <tr class="successful">
-                  <td>the result</td>
-                  <td>Success</td>
-               </tr>
-            </tbody>
-         </table>
-      </div>
-      <div id="d3e33">
-         <h2 class="successful">call local var<span class="scenario-totals">2/0/0/2</span></h2>
-         <table class="xspec" id="t-d3e33">
-            <col width="85%" />
-            <col width="15%" />
-            <tbody>
-               <tr class="successful">
-                  <th>call local var</th>
-                  <th>2/0/0/2</th>
-               </tr>
-               <tr class="successful">
-                  <td>the result</td>
-                  <td>Success</td>
-               </tr>
-               <tr class="successful">
-                  <td>the result</td>
-                  <td>Success</td>
-               </tr>
-            </tbody>
-         </table>
-      </div>
-   </body>
-</html>
\ No newline at end of file
diff --git a/test/xspec/xspec-variable-result.xml b/test/xspec/xspec-variable-result.xml
deleted file mode 100644
index 75feb3e36..000000000
--- a/test/xspec/xspec-variable-result.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="file:/home/sandro/Documents/programming/github/cirulls/xspec/src/compiler/format-xspec-report.xsl"?>
-<x:report xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-          xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          xmlns:test="http://www.jenitennison.com/xslt/unit-test"
-          xmlns:x="http://www.jenitennison.com/xslt/xspec"
-          xmlns:t="http://www.jenitennison.com/xslt/xspec"
-          xmlns:my="http://example.org/ns/my"
-          stylesheet="file:/home/sandro/Documents/programming/github/cirulls/xspec/test/xspec-tested.xsl"
-          date="2016-08-11T23:20:04.105+01:00">
-   <x:scenario>
-      <x:label>call global var</x:label>
-      <x:call function="my:square">
-         <x:param select="$test-3/@num"/>
-      </x:call>
-      <x:result select="9"/>
-      <x:test successful="true">
-         <x:label>the result</x:label>
-         <x:result select="9"/>
-      </x:test>
-      <x:test successful="true">
-         <x:label>the result</x:label>
-         <x:result select="9"/>
-      </x:test>
-   </x:scenario>
-   <x:scenario>
-      <x:label>call local var</x:label>
-      <x:call function="my:square">
-         <x:param select="$param"/>
-      </x:call>
-      <x:result select="9"/>
-      <x:test successful="true">
-         <x:label>the result</x:label>
-         <x:result select="9"/>
-      </x:test>
-      <x:test successful="true">
-         <x:label>the result</x:label>
-         <x:result select="9"/>
-      </x:test>
-   </x:scenario>
-</x:report>
diff --git a/test/xspec/xspec-variable.xsl b/test/xspec/xspec-variable.xsl
deleted file mode 100644
index 65ed55443..000000000
--- a/test/xspec/xspec-variable.xsl
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:test="http://www.jenitennison.com/xslt/unit-test"
-                xmlns:x="http://www.jenitennison.com/xslt/xspec"
-                xmlns:__x="http://www.w3.org/1999/XSL/TransformAliasAlias"
-                xmlns:pkg="http://expath.org/ns/pkg"
-                xmlns:impl="urn:x-xspec:compile:xslt:impl"
-                xmlns:t="http://www.jenitennison.com/xslt/xspec"
-                xmlns:my="http://example.org/ns/my"
-                version="2.0"
-                exclude-result-prefixes="pkg impl">
-   <xsl:import href="file:/home/sandro/Documents/programming/github/cirulls/xspec/test/xspec-tested.xsl"/>
-   <xsl:import href="file:/home/sandro/Documents/programming/github/cirulls/xspec/src/compiler/generate-tests-utils.xsl"/>
-   <xsl:namespace-alias stylesheet-prefix="__x" result-prefix="xsl"/>
-   <xsl:variable name="x:stylesheet-uri"
-                 as="xs:string"
-                 select="'file:/home/sandro/Documents/programming/github/cirulls/xspec/test/xspec-tested.xsl'"/>
-   <xsl:output name="x:report" method="xml" indent="yes"/>
-   <xsl:variable name="test-data-doc"
-                 as="document-node()"
-                 select="doc('file:/home/sandro/Documents/programming/github/cirulls/xspec/test/xspec-variable.xml')"/>
-   <xsl:variable name="test-data" select="$test-data-doc"/>
-   <xsl:variable select="$test-data/*/test[xs:integer(@num) eq 3]" name="test-3"/>
-   <xsl:template name="x:main">
-      <xsl:message>
-         <xsl:text>Testing with </xsl:text>
-         <xsl:value-of select="system-property('xsl:product-name')"/>
-         <xsl:text> </xsl:text>
-         <xsl:value-of select="system-property('xsl:product-version')"/>
-      </xsl:message>
-      <xsl:result-document format="x:report">
-         <xsl:processing-instruction name="xml-stylesheet">type="text/xsl" href="file:/home/sandro/Documents/programming/github/cirulls/xspec/src/compiler/format-xspec-report.xsl"</xsl:processing-instruction>
-         <x:report stylesheet="{$x:stylesheet-uri}" date="{current-dateTime()}">
-            <xsl:call-template name="x:d5e4"/>
-            <xsl:call-template name="x:d5e10"/>
-         </x:report>
-      </xsl:result-document>
-   </xsl:template>
-   <xsl:template name="x:d5e4">
-      <xsl:message>call global var</xsl:message>
-      <x:scenario>
-         <x:label>call global var</x:label>
-         <x:call function="my:square">
-            <x:param select="$test-3/@num"/>
-         </x:call>
-         <xsl:variable name="x:result" as="item()*">
-            <xsl:variable select="$test-3/@num" name="d6e1"/>
-            <xsl:sequence select="my:square($d6e1)"/>
-         </xsl:variable>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$x:result"/>
-            <xsl:with-param name="wrapper-name" select="'x:result'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-         <xsl:call-template name="x:d5e7">
-            <xsl:with-param name="x:result" select="$x:result"/>
-         </xsl:call-template>
-         <xsl:call-template name="x:d5e8">
-            <xsl:with-param name="x:result" select="$x:result"/>
-         </xsl:call-template>
-      </x:scenario>
-   </xsl:template>
-   <xsl:template name="x:d5e7">
-      <xsl:param name="x:result" required="yes"/>
-      <xsl:message>the result</xsl:message>
-      <xsl:variable name="impl:just-nodes"
-                    select="                          $x:result instance of node()+"/>
-      <xsl:variable name="impl:with-context"
-                    select="                          exists($x:result) and empty($x:result[2]) or $impl:just-nodes"/>
-      <xsl:variable name="impl:context" as="item()?">
-         <xsl:choose>
-            <xsl:when test="$impl:just-nodes">
-               <xsl:document>
-                  <xsl:sequence select="$x:result"/>
-               </xsl:document>
-            </xsl:when>
-            <xsl:when test="$impl:with-context">
-               <xsl:sequence select="$x:result"/>
-            </xsl:when>
-            <xsl:otherwise/>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="impl:assert" as="item()*">
-         <xsl:choose>
-            <xsl:when test="$impl:with-context">
-               <xsl:for-each select="$impl:context">
-                  <xsl:sequence select="$x:result eq $test-3/xs:integer(@value)"/>
-               </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:sequence select="$x:result eq $test-3/xs:integer(@value)"/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:if test="not($impl:assert instance of xs:boolean)">
-         <xsl:message terminate="yes">ERROR in scenario "the result": @assert|@test did not return a boolean</xsl:message>
-      </xsl:if>
-      <xsl:variable name="impl:successful" as="xs:boolean" select="$impl:assert"/>
-      <xsl:if test="not($impl:successful)">
-         <xsl:message>      FAILED</xsl:message>
-      </xsl:if>
-      <x:test successful="{ $impl:successful }">
-         <x:label>the result</x:label>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$x:result"/>
-            <xsl:with-param name="wrapper-name" select="'x:result'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-      </x:test>
-   </xsl:template>
-   <xsl:template name="x:d5e8">
-      <xsl:param name="x:result" required="yes"/>
-      <xsl:message>the result</xsl:message>
-      <xsl:variable name="impl:with-context"
-                    select="                          exists($x:result) and empty($x:result[2])"/>
-      <xsl:variable name="impl:context" as="item()?">
-         <xsl:choose>
-            <xsl:when test="$impl:with-context">
-               <xsl:sequence select="$x:result"/>
-            </xsl:when>
-            <xsl:otherwise/>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="impl:assert" as="item()*">
-         <xsl:choose>
-            <xsl:when test="$impl:with-context">
-               <xsl:for-each select="$impl:context">
-                  <xsl:sequence select="$x:result eq $test-3/xs:integer(@value)"/>
-               </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:sequence select="$x:result eq $test-3/xs:integer(@value)"/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:if test="not($impl:assert instance of xs:boolean)">
-         <xsl:message terminate="yes">ERROR in scenario "the result": @assert|@test did not return a boolean</xsl:message>
-      </xsl:if>
-      <xsl:variable name="impl:successful" as="xs:boolean" select="$impl:assert"/>
-      <xsl:if test="not($impl:successful)">
-         <xsl:message>      FAILED</xsl:message>
-      </xsl:if>
-      <x:test successful="{ $impl:successful }">
-         <x:label>the result</x:label>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$x:result"/>
-            <xsl:with-param name="wrapper-name" select="'x:result'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-      </x:test>
-   </xsl:template>
-   <xsl:template name="x:d5e10">
-      <xsl:message>call local var</xsl:message>
-      <x:scenario>
-         <x:label>call local var</x:label>
-         <x:call function="my:square">
-            <x:param select="$param"/>
-         </x:call>
-         <xsl:variable select="$test-3/@num" name="param"/>
-         <xsl:variable name="x:result" as="item()*">
-            <xsl:variable select="$param" name="d18e1"/>
-            <xsl:sequence select="my:square($d18e1)"/>
-         </xsl:variable>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$x:result"/>
-            <xsl:with-param name="wrapper-name" select="'x:result'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-         <xsl:variable select="$test-3/@value" name="result"/>
-         <xsl:call-template name="x:d5e15">
-            <xsl:with-param name="x:result" select="$x:result"/>
-            <xsl:with-param name="param" select="$param"/>
-            <xsl:with-param name="result" select="$result"/>
-         </xsl:call-template>
-         <xsl:call-template name="x:d5e16">
-            <xsl:with-param name="x:result" select="$x:result"/>
-            <xsl:with-param name="param" select="$param"/>
-            <xsl:with-param name="result" select="$result"/>
-         </xsl:call-template>
-      </x:scenario>
-   </xsl:template>
-   <xsl:template name="x:d5e15">
-      <xsl:param name="x:result" required="yes"/>
-      <xsl:param name="param" required="yes"/>
-      <xsl:param name="result" required="yes"/>
-      <xsl:message>the result</xsl:message>
-      <xsl:variable name="impl:just-nodes"
-                    select="                          $x:result instance of node()+"/>
-      <xsl:variable name="impl:with-context"
-                    select="                          exists($x:result) and empty($x:result[2]) or $impl:just-nodes"/>
-      <xsl:variable name="impl:context" as="item()?">
-         <xsl:choose>
-            <xsl:when test="$impl:just-nodes">
-               <xsl:document>
-                  <xsl:sequence select="$x:result"/>
-               </xsl:document>
-            </xsl:when>
-            <xsl:when test="$impl:with-context">
-               <xsl:sequence select="$x:result"/>
-            </xsl:when>
-            <xsl:otherwise/>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="impl:assert" as="item()*">
-         <xsl:choose>
-            <xsl:when test="$impl:with-context">
-               <xsl:for-each select="$impl:context">
-                  <xsl:sequence select="$x:result eq xs:integer($result)"/>
-               </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:sequence select="$x:result eq xs:integer($result)"/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:if test="not($impl:assert instance of xs:boolean)">
-         <xsl:message terminate="yes">ERROR in scenario "the result": @assert|@test did not return a boolean</xsl:message>
-      </xsl:if>
-      <xsl:variable name="impl:successful" as="xs:boolean" select="$impl:assert"/>
-      <xsl:if test="not($impl:successful)">
-         <xsl:message>      FAILED</xsl:message>
-      </xsl:if>
-      <x:test successful="{ $impl:successful }">
-         <x:label>the result</x:label>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$x:result"/>
-            <xsl:with-param name="wrapper-name" select="'x:result'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-      </x:test>
-   </xsl:template>
-   <xsl:template name="x:d5e16">
-      <xsl:param name="x:result" required="yes"/>
-      <xsl:param name="param" required="yes"/>
-      <xsl:param name="result" required="yes"/>
-      <xsl:message>the result</xsl:message>
-      <xsl:variable name="impl:with-context"
-                    select="                          exists($x:result) and empty($x:result[2])"/>
-      <xsl:variable name="impl:context" as="item()?">
-         <xsl:choose>
-            <xsl:when test="$impl:with-context">
-               <xsl:sequence select="$x:result"/>
-            </xsl:when>
-            <xsl:otherwise/>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="impl:assert" as="item()*">
-         <xsl:choose>
-            <xsl:when test="$impl:with-context">
-               <xsl:for-each select="$impl:context">
-                  <xsl:sequence select="$x:result eq xs:integer($result)"/>
-               </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:sequence select="$x:result eq xs:integer($result)"/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:if test="not($impl:assert instance of xs:boolean)">
-         <xsl:message terminate="yes">ERROR in scenario "the result": @assert|@test did not return a boolean</xsl:message>
-      </xsl:if>
-      <xsl:variable name="impl:successful" as="xs:boolean" select="$impl:assert"/>
-      <xsl:if test="not($impl:successful)">
-         <xsl:message>      FAILED</xsl:message>
-      </xsl:if>
-      <x:test successful="{ $impl:successful }">
-         <x:label>the result</x:label>
-         <xsl:call-template name="test:report-value">
-            <xsl:with-param name="value" select="$x:result"/>
-            <xsl:with-param name="wrapper-name" select="'x:result'"/>
-            <xsl:with-param name="wrapper-ns" select="'http://www.jenitennison.com/xslt/xspec'"/>
-         </xsl:call-template>
-      </x:test>
-   </xsl:template>
-</xsl:stylesheet>

passed/pending/failed/total	3/0/0/3
When processing a successful test	1/0/0/1
When processing a failing test	1/0/0/1
When processing successful and failing tests	1/0/0/1