diff --git a/.eslintrc b/.eslintrc
index b554368..d107a2b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,11 +1,11 @@
 {
-    "extends": ["wix-editor", "wix-editor/node", "plugin:lodash/recommended"],
+    "extends": ["wix-editor", "wix-editor/node", "plugin:lodash/canonical"],
     "plugins": ["lodash", "wix-editor"],
     "rules": {
         "semi": [2, "never"],
         "func-style": [2, "declaration", {"allowArrowFunctions": true}],
-        "prefer-spread": 0,
-        "prefer-template": 0,
+        "prefer-spread": 1,
+        "prefer-template": 1,
         "consistent-return": 0,
 
         "no-restricted-syntax": [2, "WithStatement", "ContinueStatement", "ForStatement"],
diff --git a/package.json b/package.json
index 1393c73..e075401 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
   "scripts": {
     "build": "npm run lint && npm run test",
     "lint": "eslint .",
-    "test": "babel-node test/src/test.js",
+    "test1": "babel-node test/src/test.js",
+    "test": "mocha test/src/**/*.unit.js",
     "test-cov": "istanbul cover test/src/test.js -- --require test/support/env --reporter dot --check-leaks test/ test/acceptance/",
     "patch": "npm version patch -m\"update version to %s\" && git push && git push --tags",
     "minor": "npm version minor -m\"update version to %s\" && git push && git push --tags",
@@ -35,40 +36,41 @@
     "css": "2.2.1",
     "escodegen": "1.8.1",
     "esprima": "3.1.3",
-    "glob": "7.1.1",
+    "glob": "7.1.2",
     "lodash": "4.17.4",
     "normalize-html-whitespace": "0.2.0",
     "optionator": "0.8.2",
     "text-table": "0.2.0"
   },
   "devDependencies": {
-    "babel-cli": "6.18.0",
-    "babel-core": "6.21.0",
-    "babel-loader": "6.2.10",
-    "babel-preset-es2015": "6.18.0",
-    "brace": "0.9.1",
+    "babel-cli": "6.24.1",
+    "babel-core": "6.25.0",
+    "babel-loader": "7.1.1",
+    "babel-preset-es2015": "6.24.1",
+    "brace": "0.10.0",
     "brfs": "1.4.3",
-    "coveralls": "2.11.15",
-    "eslint": "3.12.2",
+    "coveralls": "2.13.1",
+    "eslint": "4.1.1",
     "eslint-config-wix-editor": "0.2.3",
-    "eslint-plugin-lodash": "2.2.5",
-    "eslint-plugin-react": "6.8.0",
+    "eslint-plugin-lodash": "2.4.3",
+    "eslint-plugin-react": "7.1.0",
     "eslint-plugin-wix-editor": "1.1.1",
     "grunt": "1.0.1",
     "grunt-babel": "6.0.0",
     "grunt-browserify": "5.0.0",
     "grunt-contrib-requirejs": "1.0.0",
-    "grunt-contrib-uglify": "2.0.0",
+    "grunt-contrib-uglify": "3.0.1",
     "grunt-contrib-watch": "1.0.0",
-    "grunt-eslint": "19.0.0",
+    "grunt-eslint": "20.0.0",
     "grunt-tape": "0.1.0",
     "istanbul": "0.4.5",
     "json-loader": "0.5.4",
+    "mocha": "3.4.2",
     "react": "15.3.2",
     "react-dom": "15.3.2",
     "react-native": "0.39.2",
-    "tape": "4.6.3",
-    "webpack": "1.14.0"
+    "tape": "4.7.0",
+    "webpack": "3.0.0"
   },
   "keywords": [
     "templates",
diff --git a/playground/aceEditor.js b/playground/aceEditor.js
index c5f3284..cd11496 100644
--- a/playground/aceEditor.js
+++ b/playground/aceEditor.js
@@ -33,7 +33,7 @@ define(['react', 'lodash']/*, 'ace'*/, function (React, _/*, ace*/) {
         },
         componentDidMount: function () {
             this.editor = ace.edit(this.props.id || this.state.editorId)
-//        this.editor.setTheme('ace/theme/monokai');
+            // this.editor.setTheme('ace/theme/monokai');
             this.editor.setTheme('ace/theme/solarized_light')
             if (this.props.mode === 'html') {
                 this.editor.getSession().setMode('ace/mode/html')
diff --git a/src/rtStyle.js b/src/rtStyle.js
index 3782349..23fb402 100644
--- a/src/rtStyle.js
+++ b/src/rtStyle.js
@@ -5,7 +5,7 @@ const rtnData = require('./rt-style-support-data.js')
 
 
 const templateCommonJSTemplate = _.template(
-`'use strict';
+    `'use strict';
 var style = <%= body %>;
 module.exports = style;
 `)
diff --git a/test/src/.eslintrc b/test/src/.eslintrc
new file mode 100644
index 0000000..4668ae7
--- /dev/null
+++ b/test/src/.eslintrc
@@ -0,0 +1,5 @@
+{
+    "env": {
+        "mocha": true
+    }
+}
diff --git a/test/src/fsUtil.spec.js b/test/src/fsUtil.spec.js
deleted file mode 100644
index b77de9c..0000000
--- a/test/src/fsUtil.spec.js
+++ /dev/null
@@ -1,31 +0,0 @@
-'use strict'
-const fs = require('fs')
-const fsUtil = require('../../src/fsUtil')
-const path = require('path')
-
-module.exports = {
-    runTests(test, dataPath) {
-        test('test isStale', t => {
-            const a = path.join(dataPath, 'a.tmp')
-            const b = path.join(dataPath, 'b.tmp')
-
-            fs.writeFileSync(a, 'actual')
-            fs.writeFileSync(b, 'actual')
-
-            const mtime1 = new Date(1995, 11, 17, 3, 24, 0)
-            fs.utimesSync(a, mtime1, mtime1)
-
-            const mtime2 = new Date(1995, 11, 17, 3, 24, 1)
-            fs.utimesSync(b, mtime2, mtime2)
-
-            let actual = fsUtil.isStale(a, b)
-            t.equal(actual, false)
-            actual = fsUtil.isStale(b, a)
-            t.equal(actual, true)
-
-            fs.unlinkSync(a)
-            fs.unlinkSync(b)
-            t.end()
-        })
-    }
-}
diff --git a/test/src/fsUtil.unit.js b/test/src/fsUtil.unit.js
new file mode 100644
index 0000000..cd26f74
--- /dev/null
+++ b/test/src/fsUtil.unit.js
@@ -0,0 +1,30 @@
+'use strict'
+const fs = require('fs')
+const fsUtil = require('../../src/fsUtil')
+const path = require('path')
+const assert = require('assert')
+
+describe('utils', () => {
+    it('test isStale', () => {
+        const dataPath = path.resolve(__dirname, '..', 'data')
+        const a = path.join(dataPath, 'a.tmp')
+        const b = path.join(dataPath, 'b.tmp')
+
+        fs.writeFileSync(a, 'actual')
+        fs.writeFileSync(b, 'actual')
+
+        const mtime1 = new Date(1995, 11, 17, 3, 24, 0)
+        fs.utimesSync(a, mtime1, mtime1)
+
+        const mtime2 = new Date(1995, 11, 17, 3, 24, 1)
+        fs.utimesSync(b, mtime2, mtime2)
+
+        let actual = fsUtil.isStale(a, b)
+        assert.equal(actual, false)
+        actual = fsUtil.isStale(b, a)
+        assert.equal(actual, true)
+
+        fs.unlinkSync(a)
+        fs.unlinkSync(b)
+    })
+})
diff --git a/test/src/rt-html-valid.spec.js b/test/src/rt-html-valid.unit.js
similarity index 52%
rename from test/src/rt-html-valid.spec.js
rename to test/src/rt-html-valid.unit.js
index 7d00881..741feef 100644
--- a/test/src/rt-html-valid.spec.js
+++ b/test/src/rt-html-valid.unit.js
@@ -1,39 +1,41 @@
 'use strict'
 const reactTemplates = require('../../src/reactTemplates')
-const testUtils = require('./testUtils')
+const testUtils = require('./utils/testUtils')
 const readFileNormalized = testUtils.readFileNormalized
 const path = require('path')
 const fsUtil = require('../../src/fsUtil')
 const fs = require('fs')
+const assert = require('assert')
 
-module.exports = {
-    runTests(test, dataPath) {
-        test('html tests', t => {
-            const files = [
-                'scope.rt',
-                'scope-trailing-semicolon.rt',
-                'scope-variable-references.rt',
-                'lambda.rt',
-                'eval.rt',
-                'props.rt',
-                'custom-element.rt',
-                'style.rt',
-                'concat.rt',
-                'js-in-attr.rt',
-                'props-class.rt',
-                'rt-class.rt',
-                'className.rt',
-                'svg.rt',
-                'virtual.rt',
-                'scope-evaluated-after-repeat.rt',
-                'scope-evaluated-after-repeat2.rt',
-                'scope-evaluated-after-if.rt',
-                'scope-obj.rt',
-                'scope-reserved-tokens.rt',
-                'repeat-literal-collection.rt',
-                'include.rt'
-            ]
+const files = [
+    'scope.rt',
+    'scope-trailing-semicolon.rt',
+    'scope-variable-references.rt',
+    'lambda.rt',
+    'eval.rt',
+    'props.rt',
+    'custom-element.rt',
+    'style.rt',
+    'concat.rt',
+    'js-in-attr.rt',
+    'props-class.rt',
+    'rt-class.rt',
+    'className.rt',
+    'svg.rt',
+    'virtual.rt',
+    'scope-evaluated-after-repeat.rt',
+    'scope-evaluated-after-repeat2.rt',
+    'scope-evaluated-after-if.rt',
+    'scope-obj.rt',
+    'scope-reserved-tokens.rt',
+    'repeat-literal-collection.rt',
+    'include.rt'
+]
 
+describe('utils', () => {
+    describe('#convertText', () => {
+        it('should convert text successfully', () => {
+            const dataPath = path.resolve(__dirname, '..', 'data')
             files.forEach(testFile => {
                 const filename = path.join(dataPath, testFile)
                 const options = {
@@ -47,16 +49,15 @@ module.exports = {
                     const expected = testUtils.normalizeHtml(readFileNormalized(filename + '.html'))
                     const code = reactTemplates.convertTemplateToReact(html, options).replace(/\r/g, '')
                     actual = testUtils.normalizeHtml(testUtils.codeToHtml(code))
-                    equal = t.equal(actual, expected, `${testFile}`)
+                    equal = assert.equal(actual, expected, `${testFile}`)
                 } catch (e) {
                     console.log(testFile, e)
-                    t.fail(e)
+                    assert.fail(e)
                 }
                 if (!equal) {
                     fs.writeFileSync(filename + '.actual.html', actual)
                 }
             })
-            t.end()
         })
-    }
-}
+    })
+})
diff --git a/test/src/rt.invalid.spec.js b/test/src/rt.invalid.unit.js
similarity index 67%
rename from test/src/rt.invalid.spec.js
rename to test/src/rt.invalid.unit.js
index ee5bfc6..9007a41 100644
--- a/test/src/rt.invalid.spec.js
+++ b/test/src/rt.invalid.unit.js
@@ -1,27 +1,72 @@
 'use strict'
 const reactTemplates = require('../../src/reactTemplates')
-const testUtils = require('./testUtils')
+const testUtils = require('./utils/testUtils')
 const _ = require('lodash')
 const path = require('path')
 const RTCodeError = reactTemplates.RTCodeError
+const assert = require('assert')
+const cli = require('../../src/cli')
+const context = require('../../src/context')
 
 const omitStack = err => _.omit(err, 'stack', 'toIssue')
 
-module.exports = {
-    runTests(test, basePath) {
-        const dataPath = path.resolve(basePath, 'invalid')
+/**
+ * @param {ERR} err
+ * @return {ERR}
+ */
+function normalizeError(err) {
+    if (err) {
+        err.msg = err.msg.replace(/\r/g, '')
+    }
+    return err
+}
+
+/**
+ * @typedef {{index: number, line: number, column: number, msg: string, level: string, file: string}} ERR
+ */
+
+/**
+ * @param {RTCodeError} err
+ * @param {string} file
+ * @return {ERR}
+ */
+function errorEqualMessage(err, file) {
+    return {
+        index: err.index,
+        line: err.line,
+        column: err.column,
+        startOffset: err.startOffset,
+        endOffset: err.endOffset,
+        msg: err.message,
+        level: 'ERROR',
+        file
+    }
+}
+
+describe('utils', () => {
+    describe('#convertText', () => {
+        const dataPath = path.resolve(__dirname, '..', 'data', 'invalid')
         const invalidFiles = [
             // {file: 'sortByDragListItemRowExamples.rt', issue: new RTCodeError('x', 0, 160, 1, 1)}
             {file: 'if-with-scope/invalid-if-scope-1.rt', issue: new RTCodeError("invalid scope mapping used in if part 'this.bar(activeUsers.length)'", 0, 160, 1, 1)},
             {file: 'if-with-scope/invalid-if-scope-2.rt', issue: new RTCodeError("invalid scope mapping used in if part 'this.bar[activeUsers || 0]'", 0, 158, 1, 1)},
-            {file: 'if-with-scope/invalid-if-scope-3.rt', issue: new RTCodeError("invalid scope mapping used in if part 'this.foo + activeUsers.length > this.bar'", 0, 172, 1, 1)},
+            {
+                file: 'if-with-scope/invalid-if-scope-3.rt',
+                issue: new RTCodeError("invalid scope mapping used in if part 'this.foo + activeUsers.length > this.bar'", 0, 172, 1, 1)
+            },
             {file: 'if-with-scope/invalid-if-scope-4.rt', issue: new RTCodeError("invalid scope mapping used in if part 'getCurrentActiveUsers().length'", 0, 170, 1, 1)},
             {file: 'if-with-scope/invalid-if-scope-5.rt', issue: new RTCodeError("invalid scope mapping used in if part 'this.bar({activeUsers})'", 0, 155, 1, 1)},
             {file: 'invalid-scope.rt', issue: new RTCodeError("invalid scope part 'a in a in a'", 0, 35, 1, 1)},
             {file: 'invalid-html.rt', issue: new RTCodeError('Document should have a root element', -1, -1, -1, -1)},
             {file: 'invalid-exp.rt', issue: new RTCodeError("Failed to parse text '\n    {z\n'", 5, 13, 1, 6)},
-            {file: 'invalid-lambda.rt', issue: new RTCodeError("when using 'on' events, use lambda '(p1,p2)=>body' notation or 'this.handler'; otherwise use {} to return a callback function. error: [onClick='']", 0, 23, 1, 1)},
-            {file: 'invalid-autobind.rt', issue: new RTCodeError("'this.handler' syntax allowed only when the --autobind is on, use {} to return a callback function.", 0, 132, 1, 1)},
+            {
+                file: 'invalid-lambda.rt',
+                issue: new RTCodeError("when using 'on' events, use lambda '(p1,p2)=>body' notation or 'this.handler'; otherwise use {} to return a callback function. error: [onClick='']", 0, 23, 1, 1)
+            },
+            {
+                file: 'invalid-autobind.rt',
+                issue: new RTCodeError("'this.handler' syntax allowed only when the --autobind is on, use {} to return a callback function.", 0, 132, 1, 1)
+            },
             // {file: 'invalid-js.rt', issue: new RTCodeError('Unexpected token ILLEGAL', 0, 32, 1, 1)}, bug interduced due to scope parsing
             {file: 'invalid-single-root.rt', issue: new RTCodeError('Document should have no more than a single root element', 12, 23, 2, 1)},
             {file: 'invalid-repeat-1.rt', issue: new RTCodeError("rt-repeat invalid 'in' expression 'a in b in c'", 9, 44, 2, 4)},
@@ -42,9 +87,7 @@ module.exports = {
             {file: 'invalid-virtual-2.rt', issue: new RTCodeError("<rt-virtual> may not contain attributes other than 'rt-scope', 'rt-if' and 'rt-repeat'", 9, 119, 2, 4)}
         ]
 
-        test('invalid tests', t => {
-            t.plan(invalidFiles.length)
-
+        it('should convert text successfully', () => {
             invalidFiles.forEach(testFile => {
                 const filename = path.join(dataPath, testFile.file)
                 const html = testUtils.readFileNormalized(filename)
@@ -54,25 +97,8 @@ module.exports = {
                 } catch (e) {
                     error = e
                 }
-                t.deepEqual(omitStack(error), omitStack(testFile.issue), 'Expect convertTemplateToReact to throw an error')
+                assert.deepEqual(omitStack(error), omitStack(testFile.issue), 'Expect convertTemplateToReact to throw an error')
             })
-        })
-
-        /**
-         * @param {ERR} err
-         * @return {ERR}
-         */
-        function normalizeError(err) {
-            if (err) {
-                err.msg = err.msg.replace(/\r/g, '')
-            }
-            return err
-        }
-
-        test('invalid tests json', t => {
-            const cli = require('../../src/cli')
-            const context = require('../../src/context')
-            t.plan(invalidFiles.length)
 
             invalidFiles.forEach(check)
 
@@ -81,31 +107,11 @@ module.exports = {
                 const filename = path.join(dataPath, testFile.file)
                 const options = {format: 'json', force: true}
                 cli.handleSingleFile(_.assign(options, testFile.options), filename)
-                t.deepEqual(normalizeError(context.getMessages()[0]), errorEqualMessage(testFile.issue, filename), `Expect cli to produce valid output messages ${testFile.file}`)
+                assert.deepEqual(normalizeError(context.getMessages()[0]), errorEqualMessage(testFile.issue, filename), `Expect cli to produce valid output messages ${testFile.file}`)
             }
         })
+    })
+})
 
-        /**
-         * @typedef {{index: number, line: number, column: number, msg: string, level: string, file: string}} ERR
-         */
 
-        /**
-         * @param {RTCodeError} err
-         * @param {string} file
-         * @return {ERR}
-         */
-        function errorEqualMessage(err, file) {
-            return {
-                index: err.index,
-                line: err.line,
-                column: err.column,
-                startOffset: err.startOffset,
-                endOffset: err.endOffset,
-                msg: err.message,
-                level: 'ERROR',
-                file
-            }
-        }
-    }
-}
 
diff --git a/test/src/rt.valid.spec.js b/test/src/rt.valid.unit.js
similarity index 70%
rename from test/src/rt.valid.spec.js
rename to test/src/rt.valid.unit.js
index c3efaa6..33ee547 100644
--- a/test/src/rt.valid.spec.js
+++ b/test/src/rt.valid.unit.js
@@ -1,55 +1,63 @@
 'use strict'
 const _ = require('lodash')
 const reactTemplates = require('../../src/reactTemplates')
-const testUtils = require('./testUtils')
+const testUtils = require('./utils/testUtils')
 const readFileNormalized = testUtils.readFileNormalized
 const compareAndWrite = testUtils.compareAndWrite
 const path = require('path')
 const context = require('../../src/context')
+const assert = require('assert')
+const dataPath = path.resolve(__dirname, '..', 'data')
 
-module.exports = {
-    runTests(test, dataPath) {
-        function check(t, testData) {
-            const filename = path.join(dataPath, testData.source)
-            const html = readFileNormalized(filename)
-            const expected = readFileNormalized(path.join(dataPath, testData.expected))
-            const actual = reactTemplates.convertTemplateToReact(html, testData.options).replace(/\r/g, '').trim()
-            compareAndWrite(t, actual, expected, filename)
-        }
+/**
+ * @param testData
+ */
+function check(testData) {
+    const filename = path.join(dataPath, testData.source)
+    const html = readFileNormalized(filename)
+    const expected = readFileNormalized(path.join(dataPath, testData.expected))
+    const actual = reactTemplates.convertTemplateToReact(html, testData.options).replace(/\r/g, '').trim()
+    compareAndWrite(actual, expected, filename)
+}
 
-        function testFiles(t, files, options) {
-            t.plan(files.length)
-            files.forEach(testFile => {
-                check(t, {
-                    source: testFile,
-                    expected: `${testFile}.js`,
-                    options
-                })
-            })
-        }
+/**
+ * @param files
+ * @param options
+ */
+function testFiles(files, options) {
+    files.forEach(testFile => {
+        check({
+            source: testFile,
+            expected: `${testFile}.js`,
+            options
+        })
+    })
+}
 
-        test('rt-if with rt-scope test', t => {
+describe('utils', () => {
+    describe('#convertText', () => {
+        it('rt-if with rt-scope test', () => {
             const files = ['if-with-scope/valid-if-scope.rt']
             const options = {modules: 'amd'}
-            testFiles(t, files, options)
+            testFiles(files, options)
         })
 
-        test('conversion test', t => {
+        it('conversion test', () => {
             const files = ['div.rt', 'test.rt', 'repeat.rt', 'repeat-with-index.rt', 'inputs.rt', 'virtual.rt', 'stateless.rt', 'style-vendor-prefix.rt', 'non-breaking-space.rt']
             const options = {modules: 'amd'}
-            testFiles(t, files, options)
+            testFiles(files, options)
         })
 
-        test('autobinding conversion test', t => {
+        it('autobinding conversion test', () => {
             const options = {
                 modules: 'amd',
                 autobind: true
             }
             const files = ['autobind.rt']
-            testFiles(t, files, options)
+            testFiles(files, options)
         })
 
-        test('prop template conversion test', t => {
+        it('prop template conversion test', () => {
             const options = {
                 propTemplates: {
                     List: {
@@ -65,10 +73,10 @@ module.exports = {
                 'twoTemplates.rt',
                 'siblingTemplates.rt'
             ].map(file => path.join('propTemplates', file))
-            testFiles(t, files, options)
+            testFiles(files, options)
         })
 
-        test('conversion test - native', t => {
+        it('conversion test - native', () => {
             const options = {
                 propTemplates: {
                     MyComp: {
@@ -87,11 +95,10 @@ module.exports = {
                 {source: 'native/listViewTemplate.rt', expected: 'native/listViewTemplate.rt.v029.js', options: optionsNew},
                 {source: 'native/listViewAndCustomTemplate.rt', expected: 'native/listViewAndCustomTemplate.rt.v029.js', options: optionsNew}
             ]
-            t.plan(files.length)
-            files.forEach(file => check(t, file))
+            files.forEach(check)
         })
 
-        test('convert div with all module types', t => {
+        it('convert div with all module types', () => {
             const files = [
                 {source: 'div.rt', expected: 'div.rt.commonjs.js', options: {modules: 'commonjs'}},
                 {source: 'div.rt', expected: 'div.rt.amd.js', options: {modules: 'amd', name: 'div'}},
@@ -100,26 +107,24 @@ module.exports = {
                 {source: 'div.rt', expected: 'div.rt.typescript.ts', options: {modules: 'typescript'}},
                 {source: 'div.rt', expected: 'div.rt.15.js', options: {targetVersion: '15.0.0', modules: 'amd'}}
             ]
-            t.plan(files.length)
-            files.forEach(file => check(t, file))
+            files.forEach(check)
         })
 
-        test('normalize whitespace', t => {
+        it('normalize whitespace', () => {
             const files = ['whitespace.rt']
             const options = {normalizeHtmlWhitespace: true, modules: 'amd'}
-            testFiles(t, files, options)
+            testFiles(files, options)
         })
 
-        test('convert comment with AMD and ES6 modules', t => {
+        it('convert comment with AMD and ES6 modules', () => {
             const files = [
                 {source: 'comment.rt', expected: 'comment.rt.amd.js', options: {modules: 'amd'}},
                 {source: 'comment.rt', expected: 'comment.rt.es6.js', options: {modules: 'es6'}}
             ]
-            t.plan(files.length)
-            files.forEach(file => check(t, file))
+            files.forEach(check)
         })
 
-        test('rt-require with all module types', t => {
+        it('rt-require with all module types', () => {
             const files = [
                 {source: 'require.rt', expected: 'require.rt.commonjs.js', options: {modules: 'commonjs'}},
                 {source: 'require.rt', expected: 'require.rt.amd.js', options: {modules: 'amd', name: 'div'}},
@@ -127,11 +132,10 @@ module.exports = {
                 {source: 'require.rt', expected: 'require.rt.es6.js', options: {modules: 'es6'}},
                 {source: 'require.rt', expected: 'require.rt.typescript.ts', options: {modules: 'typescript'}}
             ]
-            t.plan(files.length)
-            files.forEach(file => check(t, file))
+            files.forEach(check)
         })
 
-        test('rt-import with all module types', t => {
+        it('rt-import with all module types', () => {
             const files = [
                 {source: 'import.rt', expected: 'import.rt.commonjs.js', options: {modules: 'commonjs'}},
                 {source: 'import.rt', expected: 'import.rt.amd.js', options: {modules: 'amd', name: 'div'}},
@@ -139,20 +143,18 @@ module.exports = {
                 {source: 'import.rt', expected: 'import.rt.es6.js', options: {modules: 'es6'}},
                 {source: 'import.rt', expected: 'import.rt.typescript.ts', options: {modules: 'typescript'}}
             ]
-            t.plan(files.length)
-            files.forEach(file => check(t, file))
+            files.forEach(check)
         })
 
-        test('convert jsrt and test source results', t => {
+        it('convert jsrt and test source results', () => {
             const files = ['simple.jsrt']
-            t.plan(files.length)
             files.forEach(file => {
                 const filename = path.join(dataPath, file)
                 const js = readFileNormalized(filename)
                 const expected = readFileNormalized(path.join(dataPath, file.replace('.jsrt', '.js')))
                 const actual = reactTemplates.convertJSRTToJS(js, context).replace(/\r/g, '').trim()
-                compareAndWrite(t, actual, expected, filename)
+                compareAndWrite(actual, expected, filename)
             })
         })
-    }
-}
+    })
+})
diff --git a/test/src/rtStyle.spec.js b/test/src/rtStyle.spec.js
deleted file mode 100644
index 00997e3..0000000
--- a/test/src/rtStyle.spec.js
+++ /dev/null
@@ -1,14 +0,0 @@
-'use strict'
-const rtStyle = require('../../src/rtStyle')
-
-module.exports = {
-    runTests(test) {
-        test('test rtStyle', t => {
-            const text = '.text { background-color: #00346E; padding: 3px; }'
-            const expected = '{\n  "text": {\n    "backgroundColor": "#00346E",\n    "padding": 3\n  }\n}'
-            const actual = rtStyle.convertBody(text)
-            t.equal(actual, expected)
-            t.end()
-        })
-    }
-}
diff --git a/test/src/rtStyle.unit.js b/test/src/rtStyle.unit.js
new file mode 100644
index 0000000..13af110
--- /dev/null
+++ b/test/src/rtStyle.unit.js
@@ -0,0 +1,12 @@
+'use strict'
+const assert = require('assert')
+const rtStyle = require('../../src/rtStyle')
+
+describe('rtStyle', () => {
+    it('should convertBody style successfully', () => {
+        const text = '.text { background-color: #00346E; padding: 3px; }'
+        const expected = '{\n  "text": {\n    "backgroundColor": "#00346E",\n    "padding": 3\n  }\n}'
+        const actual = rtStyle.convertBody(text)
+        assert.equal(actual, expected)
+    })
+})
diff --git a/test/src/shell.spec.js b/test/src/shell.unit.js
similarity index 67%
rename from test/src/shell.spec.js
rename to test/src/shell.unit.js
index 95ffc56..11bf1b5 100644
--- a/test/src/shell.spec.js
+++ b/test/src/shell.unit.js
@@ -2,33 +2,32 @@
 const context = require('../../src/context')
 const _ = require('lodash')
 const path = require('path')
+const assert = require('assert')
 
-module.exports = {
-    runTests(test, dataPath) {
-        test('test context', t => {
+describe('rtStyle', () => {
+    it('should convertBody style successfully', () => {
+        it('should convertBody style successfully', () => {
             context.clear()
-            t.equal(context.hasErrors(), false)
+            assert.equal(context.hasErrors(), false)
             context.error('hi', '', 1, 1)
-            t.equal(context.hasErrors(), true)
+            assert.equal(context.hasErrors(), true)
             context.clear()
-            t.equal(context.hasErrors(), false)
-
-            t.end()
+            assert.equal(context.hasErrors(), false)
         })
 
-        test('test shell', t => {
+        it('test shell', () => {
             const shell = require('../../src/shell')
             const newContext = _.cloneDeep(context)
             let outputJSON = ''
             newContext.options.format = 'json'
             newContext.report = function (text) { outputJSON = text }
             let r = shell.printResults(newContext)
-            t.equal(r, 0)
+            assert.equal(r, 0)
             context.error('hi', '', 1, 1)
             r = shell.printResults(newContext)
-            t.equal(r, 1)
+            assert.equal(r, 1)
             const output = JSON.parse(outputJSON)
-            t.deepEqual(output, [{
+            assert.deepEqual(output, [{
                 column: 1,
                 endOffset: -1,
                 file: null,
@@ -39,15 +38,13 @@ module.exports = {
                 startOffset: -1
             }])
             context.clear()
-            t.end()
         })
 
-        test('test shell', t => {
+        it('test shell', () => {
             const filename = path.join(dataPath, 'div.rt')
             const cli = require('../../src/cli')
             const r = cli.execute(`${filename} -r --dry-run`)
-            t.equal(r, 0)
-            t.end()
+            assert.equal(r, 0)
         })
-    }
-}
+    })
+})
diff --git a/test/src/test.js b/test/src/test.js
deleted file mode 100644
index 4395764..0000000
--- a/test/src/test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict'
-const test = require('tape')
-const path = require('path')
-const dataPath = path.resolve(__dirname, '..', 'data')
-
-const specs = ['rt.invalid', 'rt.valid', 'rt-html-valid', 'utils', 'shell', 'rtStyle', 'fsUtil']
-
-specs
-    .map(file => require(`./${file}.spec`))
-    .forEach(spec => spec.runTests(test, dataPath))
diff --git a/test/src/utils.spec.js b/test/src/utils.spec.js
deleted file mode 100644
index 4b2c92d..0000000
--- a/test/src/utils.spec.js
+++ /dev/null
@@ -1,20 +0,0 @@
-'use strict'
-
-const utils = require('../../src/utils')
-
-module.exports = {
-    runTests(test) {
-        test('test convertText', t => {
-            const texts = [
-                {input: '{}', expected: '()'},
-                {input: "a {'b'}", expected: '"a "+(\'b\')'}
-            ]
-            t.plan(texts.length)
-            texts.forEach(check)
-            function check(testData) {
-                const r = utils.convertText({}, {}, testData.input)
-                t.equal(r, testData.expected)
-            }
-        })
-    }
-}
diff --git a/test/src/utils.unit.js b/test/src/utils.unit.js
new file mode 100644
index 0000000..386c68b
--- /dev/null
+++ b/test/src/utils.unit.js
@@ -0,0 +1,30 @@
+'use strict'
+const assert = require('assert')
+const utils = require('../../src/utils')
+
+describe('utils', () => {
+    describe('#convertText', () => {
+        it('should convert text successfully', () => {
+            const texts = [
+                {input: '{}', expected: '()'},
+                {input: "a {'b'}", expected: '"a "+(\'b\')'}
+            ]
+            texts.forEach(check)
+            function check(testData) {
+                const r = utils.convertText({}, {}, testData.input)
+                assert.equal(r, testData.expected)
+            }
+        })
+
+        it('should fail', () => {
+            const texts = [
+                {input: '() => {}', expected: '"() => "+()'}
+            ]
+            texts.forEach(check)
+            function check(testData) {
+                const r = utils.convertText({}, {}, testData.input)
+                assert.equal(r, testData.expected)
+            }
+        })
+    })
+})
diff --git a/test/src/testUtils.js b/test/src/utils/testUtils.js
similarity index 92%
rename from test/src/testUtils.js
rename to test/src/utils/testUtils.js
index e912ff7..f11c885 100644
--- a/test/src/testUtils.js
+++ b/test/src/utils/testUtils.js
@@ -2,10 +2,11 @@
 const cheerio = require('cheerio')
 const fs = require('fs')
 const path = require('path')
-const reactTemplates = require('../../src/reactTemplates')
+const reactTemplates = require('../../../src/reactTemplates')
 const React = require('react')
 const ReactDOMServer = require('react-dom/server')
 const _ = require('lodash')
+const assert = require('assert')
 
 /**
  * @param {string} html
@@ -25,8 +26,8 @@ function normalizeHtml(html) {
  * @param {string} filename
  * @return {boolean} whether actual is equal to expected
  */
-function compareAndWrite(t, actual, expected, filename) {
-    t.equal(actual, expected, filename)
+function compareAndWrite(actual, expected, filename) {
+    assert.equal(actual, expected, filename)
     if (actual !== expected) {
         fs.writeFileSync(`${filename}.actual.js`, actual)
         return false
diff --git a/wallaby.js b/wallaby.js
index 953b1f0..d363fcb 100644
--- a/wallaby.js
+++ b/wallaby.js
@@ -5,11 +5,10 @@
 module.exports = function (/*wallaby*/) {
     return {
         files: [
-            'src/**/*.js'
-            // {pattern: 'lib/data/*.*', instrument: false},
-            // 'lib/formatters/*.js',
-            // {pattern: 'test/testData/**/*.*', instrument: false},
-            // {pattern: 'test/src/utils/*.js', instrument: false}
+            'src/**/*.js',
+            'test/src/utils/**/*.js',
+            {pattern: 'test/data/**/*', instrument: false},
+            {pattern: 'package.json', instrument: false}
         ],
         tests: [
             'test/**/*.unit.js'
@@ -30,10 +29,10 @@ module.exports = function (/*wallaby*/) {
             //runner: '/usr/local/bin/jasmine-node'
             // or
             // runner: 'path to the desired node version'
-//            params: {
-//                runner: '--harmony --harmony_arrow_functions',
-//                env: 'PARAM1=true;PARAM2=false'
-//            }
+            // params: {
+            //     runner: '--harmony --harmony_arrow_functions',
+            //     env: 'PARAM1=true;PARAM2=false'
+            // }
         },
         setup: function (w) {
             // require(path.resolve(__dirname, './spec/support/unit-init.js'))