diff --git a/src/cli/cms/Page.js b/src/cli/cms/Page.js
index 04d0759a..837dd8ee 100644
--- a/src/cli/cms/Page.js
+++ b/src/cli/cms/Page.js
@@ -144,7 +144,7 @@ export default class Page {
       }
 
       // I compile the text
-      var compiledTemplate = Handlebars.compile((!this._onlyHTML) ? util.insertDebugtoolUtilities(this.template) : this.template)
+      var compiledTemplate = Handlebars.compile((!this._onlyHTML) ? cmsTemplate.insertDebugtoolUtilities(this.template) : this.template)
 
       // I create the html page ! yeah !!!
       this.html = compiledTemplate(json, {data: {intl: config.intlData}})
diff --git a/src/cli/cms/templates/index.js b/src/cli/cms/templates/index.js
index 4edaca7f..378e369e 100755
--- a/src/cli/cms/templates/index.js
+++ b/src/cli/cms/templates/index.js
@@ -21,6 +21,7 @@ import truncate 	from './handlebars/truncate'
 
 import * as template from './template'
 import encodeAbeTagAsComment from './encodeAbeTagAsComment'
+import insertDebugtoolUtilities from './insertDebugtoolUtilities'
 
 /* Register utilities */
 Handlebars.registerHelper('attrAbe', 		attrAbe)
@@ -43,6 +44,7 @@ HandlebarsIntl.registerWith(Handlebars)
 export {
 	template,
 	encodeAbeTagAsComment,
+	insertDebugtoolUtilities,
 	attrAbe,
 	className,
 	cleanTab,
diff --git a/src/cli/cms/templates/insertDebugtoolUtilities.js b/src/cli/cms/templates/insertDebugtoolUtilities.js
new file mode 100644
index 00000000..31b2580c
--- /dev/null
+++ b/src/cli/cms/templates/insertDebugtoolUtilities.js
@@ -0,0 +1,18 @@
+import {
+  cmsData
+} from '../../'
+
+export default function insertDebugtoolUtilities(text){
+  return text.replace(
+    /<\/body>/,
+      `<style>
+        body [data-abe]{ transition: box-shadow 600ms ease-in-out; box-shadow: 0; }
+        body .select-border{ border-color: #007CDE; box-shadow: 0 3px 13px #7CBAEF; }
+        body img.display-attr:before { content: attr(alt); }
+        body a.display-attr:before { content: attr(title); }
+        body .display-attr:before { position: absolute; display: block; z-index: 555; font-size: 10px; background-color: rgba(255, 255, 255, 0.75); padding: 2px 5px; color: #5D5D5D; }
+        .hidden-abe{ display: none!important; width: 0px !important; height: 0px!important; position: absolute; left: -10000px; top: -10000px; visibility: hidden;}
+      </style>
+    </body>`
+  )
+}
\ No newline at end of file
diff --git a/src/cli/core/utils/abe-utils.js b/src/cli/core/utils/abe-utils.js
index 0dddd48b..2874d75f 100755
--- a/src/cli/core/utils/abe-utils.js
+++ b/src/cli/core/utils/abe-utils.js
@@ -90,26 +90,6 @@ export default class Utils {
     this._form[obj.tab].item.push(obj)
   }
 
-  /**
-   * Add some stuff like style / script before closing </body> tag
-   * @param  {String} text html page
-   * @return {String} text + some sugar stuff added on the fly
-   */
-  insertDebugtoolUtilities(text){
-    return text.replace(
-      /<\/body>/,
-        `<style>
-          body [data-abe]{ transition: box-shadow 600ms ease-in-out; box-shadow: 0; }
-          body .select-border{ border-color: #007CDE; box-shadow: 0 3px 13px #7CBAEF; }
-          body img.display-attr:before { content: attr(alt); }
-          body a.display-attr:before { content: attr(title); }
-          body .display-attr:before { position: absolute; display: block; z-index: 555; font-size: 10px; background-color: rgba(255, 255, 255, 0.75); padding: 2px 5px; color: #5D5D5D; }
-          .hidden-abe{ display: none!important; width: 0px !important; height: 0px!important; position: absolute; left: -10000px; top: -10000px; visibility: hidden;}
-        </style>
-      </body>`
-    )
-  }
-
   static sanitizeSourceAttribute(obj, jsonPage){
     if(typeof obj.sourceString !== 'undefined' && obj.sourceString !== null && obj.sourceString.indexOf('{{') > -1) {
       var matches = obj.sourceString.match(/({{[a-zA-Z._]+}})/g)
diff --git a/test/data.js b/test/data.js
deleted file mode 100644
index d98efac7..00000000
--- a/test/data.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var chai = require('chai');
-var path = require('path');
-
-var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures/'})
-
-var cmsTemplate = require('../src/cli').cmsTemplate;
-var Manager = require('../src/cli').Manager;
-var fse = require('fs-extra');
-
-describe('Data', function() {
-  before( function(done) {
-    Manager.instance.init()
-      .then(function () {
-
-        this.fixture = {
-          articleEach: fse.readFileSync(__dirname + '/fixtures/templates/article-each-abe.html', 'utf8'),
-        }
-        done()
-        
-      }.bind(this))
-  });
-
-  /**
-   * cmsTemplate.encodeAbeTagAsComment
-   * 
-   */
-  it('cmsTemplate.encodeAbeTagAsComment()', function() {
-    var txt = cmsTemplate.encodeAbeTagAsComment(this.fixture.articleEach);
-    chai.expect(txt.indexOf('{')).to.equal(-1);
-  });
-});
diff --git a/test/template.js b/test/template.js
index 28df9dfe..3397a2fc 100644
--- a/test/template.js
+++ b/test/template.js
@@ -14,6 +14,7 @@ describe('Template', function() {
       .then(function () {
         this.fixture = {
           template: fse.readFileSync(__dirname + '/fixtures/templates/article.html', 'utf-8'),
+          articleEach: fse.readFileSync(__dirname + '/fixtures/templates/article-each-abe.html', 'utf-8'),
           templateKeys: fse.readFileSync(__dirname + '/fixtures/templates/article-keys.html', 'utf-8')
         }
         done()
@@ -69,4 +70,22 @@ describe('Template', function() {
     var ar = cmsTemplate.template.execRequestColumns(this.fixture.templateKeys)
     chai.expect(ar.indexOf('abe_meta.date')).to.be.above(-1);
   });
+
+  /**
+   * cmsTemplate.insertDebugtoolUtilities
+   * 
+   */
+  it('cmsTemplate.insertDebugtoolUtilities()', function() {
+    var txt = cmsTemplate.insertDebugtoolUtilities('</body>');
+    chai.expect(txt.length).to.above(10);
+  });
+
+  /**
+   * cmsTemplate.encodeAbeTagAsComment
+   * 
+   */
+  it('cmsTemplate.encodeAbeTagAsComment()', function() {
+    var txt = cmsTemplate.encodeAbeTagAsComment(this.fixture.articleEach);
+    chai.expect(txt.indexOf('{')).to.equal(-1);
+  });
 });