diff --git a/.gitignore b/.gitignore
index 714ce619..46833c14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ npm-debug.log
 ### Test Output ###
 test/data/**/*.rt.actual.js
 test/data/**/*.code.js
+test/data/**/*.actual.html
+
diff --git a/docs/cli.md b/docs/cli.md
index 893d2ce4..27f38db7 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -40,6 +40,8 @@ Options:
   --flow                       Add /* @flow */ to the top of the generated file
   --native-target-version, --rnv String  React native version to generate code for (0.9.0, 0.29.0, default) - either: 0.9.0, 0.29.0, or default - default: 0.9.0
   --normalize-html-whitespace  Remove repeating whitespace from HTML text. - default: false
+  --create-element-alias       Use an alias name for "React.createElement()"
+  --external-helpers           Emit helper functions as external dependency (and do not rely on 'lodash').
 ```
 
 ### `-h`, `--help`
@@ -54,7 +56,7 @@ The option enable or disable color in the output.
 
 Use output modules. Valid targets are: `amd`, `commonjs`, `none`, `es6`, `typescript`, or `jsrt`.
 
-### `-n`, `--name` 
+### `-n`, `--name`
 
 When using globals, the name for the variable. The default is the [file name]RT, when using amd, the name of the module.
 
@@ -70,7 +72,7 @@ This option allows to override the output file even if there are no changes.
 
 Use a specific output format (`stylish` or `json`).
 
-### `-t`, `--target-version`   
+### `-t`, `--target-version`
 
 React version to generate code for (15.0.1, 15.0.0, 0.14.0, 0.13.1, 0.12.2, 0.12.1, 0.12.0, 0.11.2, 0.11.1, 0.11.0, 0.10.0, default). default: 0.14.0
 
@@ -92,13 +94,13 @@ Dependency path for importing React.
 
 ### `--lodash-import-path`
 
-Dependency path for importing lodash. 
+Dependency path for importing lodash.
 
 ### `--native`, `--rn`
 
 Renders react native templates.
 
-### `--native-target-version`, `--rnv` 
+### `--native-target-version`, `--rnv`
 
 React native version to generate code for (0.9.0, 0.29.0, default) - either: 0.9.0, 0.29.0, or default - default: 0.9.0
 
@@ -106,13 +108,72 @@ React native version to generate code for (0.9.0, 0.29.0, default) - either: 0.9
 
 Add /* @flow */ to the top of the generated file
 
-### `--normalize-html-whitespace`  
+### `--normalize-html-whitespace`
 
-Remove repeating whitespace from HTML text. 
+Remove repeating whitespace from HTML text.
 
 Repeating whitespaces normally are not displayed and thus can be removed in order to reduce
 the size of the generated JavaScript file.
 
 Whitespace removal is not applied on `<pre>` and `<textarea>` tags, or when the special attribute `rt-pre` is specified on a tag.
 
- 
+### `--create-element-alias`
+
+Use an alias name for `React.createElement()`, allowing shorter function calls in the generated JavaScript code.
+
+Example, use `h` instead of `React.createElement()`:
+```
+rt foo.rt --create-element-alias h
+```
+will generate:
+```
+var h = require('react').createElement;
+module.exports = function () {
+    return h('div', {}, h('span', {}, 'Hello'));
+};
+```
+
+If using a different library than `React` and the element-creating function is not named `createElement`,
+the actual name of the function can be specified by adding a comma after the alias:
+
+Example, use `h` from library `preact`:
+```
+rt foo.rt --react-import-path preact --create-element-alias h,h
+```
+will generate:
+```
+var h = require('preact').h;
+module.exports = function () {
+    return h('div', {}, h('span', {}, 'Hello'));
+};
+```
+
+### `--external-helpers`
+
+Specify an external module from where to load the runtime helper functions.
+
+Normally `react-templates` uses `lodash` to perform some utility functions, indeed `lodash`
+is the only needed dependency apart from the obvious `react`.
+
+By using `--external-helpers`, the utility functions will not be taken from `lodash` or
+embedded in the code, but will be loaded separately as a module, thus allowing
+to reduce or fine-tune the dependency from `lodash`.
+
+Example:
+```
+rt foo.rt --external-helpers react-templates-helpers
+```
+loads the utility functions from `react-templates-helpers` module (which is the
+standard one that falls back on `lodash`).
+
+The specified external module must export the following helper functions:
+```
+__rtmap(collection, function);  // loops over a collection
+__rtclass(object);              // turns a map object into a HTML class-attribute
+__rtassign(dest,...objs)        // assign properties to destination object
+__rtmergeprops(dest,...objs)    // as above, but considering "style" and "className"
+```
+
+
+
+
diff --git a/src/options.js b/src/options.js
index 1195f26c..7ec0203d 100644
--- a/src/options.js
+++ b/src/options.js
@@ -114,12 +114,22 @@ $ rt <filename> [<filename> ...] [<args>]`,
         alias: 'rnv',
         type: 'String',
         enum: Object.keys(reactNativeSupport),
-        default: reactNativeSupport.default,        
+        default: reactNativeSupport.default,
         description: `React native version to generate code for (${Object.keys(reactNativeSupport).join(', ')})`
     }, {
         option: 'normalize-html-whitespace',
         type: 'Boolean',
         default: 'false',
         description: 'Remove repeating whitespace from HTML text.'
+    }, {
+        option: 'create-element-alias',
+        default: '',
+        type: 'String',
+        description: 'Use an alias name for "React.createElement()".'
+    }, {
+        option: 'external-helpers',
+        default: '',
+        type: 'String',
+        description: "Emit helper functions as external dependency (and do not rely on 'lodash')"        
     }]
 });
diff --git a/src/reactTemplates.js b/src/reactTemplates.js
index 55b1c291..105c4937 100644
--- a/src/reactTemplates.js
+++ b/src/reactTemplates.js
@@ -13,33 +13,21 @@ const utils = require('./utils');
 const validateJS = utils.validateJS;
 const RTCodeError = rtError.RTCodeError;
 
-const repeatTemplate = _.template('_.map(<%= collection %>,<%= repeatFunction %>.bind(<%= repeatBinds %>))');
-const ifTemplate = _.template('((<%= condition %>)?(<%= body %>):null)');
-const propsTemplateSimple = _.template('_.assign({}, <%= generatedProps %>, <%= rtProps %>)');
-const propsTemplate = _.template('mergeProps( <%= generatedProps %>, <%= rtProps %>)');
-
-const propsMergeFunction = `function mergeProps(inline,external) {
-    var res = _.assign({},inline,external)
-    if (inline.hasOwnProperty('style')) {
-        res.style = _.defaults(res.style, inline.style);
-    }
-    if (inline.hasOwnProperty('className') && external.hasOwnProperty('className')) {
-        res.className = external.className + ' ' + inline.className;
-    }
-    return res;
-}
-`;
-
-const classSetTemplate = _.template('_(<%= classSet %>).transform(function(res, value, key){ if(value){ res.push(key); } }, []).join(" ")');
-
-function getTagTemplateString(simpleTagTemplate, shouldCreateElement) {
+let repeatTemplate;
+let propsTemplateSimple;
+let propsTemplate;
+let classSetTemplate;
+let propsMergeFunction;
+
+function getTagTemplateString(simpleTagTemplate, shouldCreateElement, opts) {
+    const createElement = parseCreateElementAlias(opts) || {alias: 'React.createElement'};
     if (simpleTagTemplate) {
-        return shouldCreateElement ? 'React.createElement(<%= name %>,<%= props %><%= children %>)' : '<%= name %>(<%= props %><%= children %>)';
+        return shouldCreateElement ? createElement.alias + '(<%= name %>,<%= props %><%= children %>)' : '<%= name %>(<%= props %><%= children %>)';
     }
-    return shouldCreateElement ? 'React.createElement.apply(this, [<%= name %>,<%= props %><%= children %>])' : '<%= name %>.apply(this, [<%= props %><%= children %>])';
+    return shouldCreateElement ? createElement.alias + '.apply(this, [<%= name %>,<%= props %><%= children %>])' : '<%= name %>.apply(this, [<%= props %><%= children %>])';
 }
 
-
+const ifTemplate = _.template('((<%= condition %>)?(<%= body %>):null)');
 const commentTemplate = _.template(' /* <%= data %> */ ');
 
 const repeatAttr = 'rt-repeat';
@@ -91,10 +79,73 @@ function reactImport(options) {
     if (options.native) {
         return reactNativeSupport[options.nativeTargetVersion].react.module;
     }
-    if (_.includes(['0.14.0', '0.15.0', '15.0.0', '15.0.1'], options.targetVersion)) {
-        return 'react';
+    if (!options.reactImportPath) {
+        const isNewReact = _.includes(['0.14.0', '0.15.0', '15.0.0', '15.0.1'], options.targetVersion);
+        return isNewReact ? 'react' : 'react/addons';
+    }
+    return options.reactImportPath;
+}
+
+/**
+ * parse the command line `--create-element-alias=alias,createElement`
+ * where the ",createElement" part is optional
+ *
+ * @return {object} the parsed {alias,name} object or undefined if the option was not specified
+ */
+function parseCreateElementAlias(opts) {
+    const opt = opts.createElementAlias;
+    if (opt) {
+        const s = opt.split(',');
+        return {alias: s[0], name: s[1] || 'createElement'};
+    }
+}
+
+function assignHelpers(options) {
+    if (options.externalHelpers) {
+        repeatTemplate = _.template('__rtmap(<%= collection %>,<%= repeatFunction %>.bind(<%= repeatBinds %>))');
+        classSetTemplate = _.template('__rtclass(<%= classSet %>)');
+        propsTemplateSimple = _.template('__rtassign({}, <%= generatedProps %>, <%= rtProps %>)');
+        propsTemplate = _.template('__rtmergeprops(<%= generatedProps %>, <%= rtProps %>)');
+    } else {
+        repeatTemplate = _.template('_.map(<%= collection %>,<%= repeatFunction %>.bind(<%= repeatBinds %>))');
+        classSetTemplate = _.template('_.transform(<%= classSet %>, function(res, value, key){ if(value){ res.push(key); } }, []).join(" ")');
+        propsTemplateSimple = _.template('_.assign({}, <%= generatedProps %>, <%= rtProps %>)');
+        propsTemplate = _.template('mergeProps(<%= generatedProps %>, <%= rtProps %>)');
+        propsMergeFunction = `function mergeProps(inline,external) {
+            var res = _.assign({},inline,external)
+            if (inline.hasOwnProperty('style')) {
+                res.style = _.defaults(res.style, inline.style);
+            }
+            if (inline.hasOwnProperty('className') && external.hasOwnProperty('className')) {
+                res.className = external.className + ' ' + inline.className;
+            }
+            return res;
+        }
+        `;
+    }
+}
+
+/**
+ * Add the appropriate helper to the list of imports, (either 'lodash' or external helper),
+ * checking if it's already imported.
+ *
+ */
+function requireHelper(helper, context) {
+    if (context.options.externalHelpers) {
+        const helperDefine = {moduleName: context.options.externalHelpers, alias: helper, member: helper};
+        if (!_.some(context.defines, helperDefine)) {
+            context.defines.push(helperDefine);
+        }
+    } else if (helper === '__rtmergeprops') {
+        if (!_.includes(context.injectedFunctions, propsMergeFunction)) {
+            context.injectedFunctions.push(propsMergeFunction);
+        }
+    } else {
+        const lodashDefine = {moduleName: context.options.lodashImportPath, alias: '_', member: '*'};
+        if (!_.some(context.defines, lodashDefine)) {
+            context.defines.push(lodashDefine);
+        }
     }
-    return 'react/addons';
 }
 
 /**
@@ -190,6 +241,7 @@ function generateProps(node, context) {
             const existing = props[propKey] ? `${props[propKey]} + " " + ` : '';
             if (key === classSetAttr) {
                 props[propKey] = existing + classSetTemplate({classSet: val});
+                requireHelper('__rtclass', context);
             } else if (key === classAttr || key === reactSupport.classNameProp) {
                 props[propKey] = existing + utils.convertText(node, context, val.trim());
             }
@@ -199,6 +251,12 @@ function generateProps(node, context) {
     });
     _.assign(props, generateTemplateProps(node, context));
 
+    // map 'className' back into 'class' for custom elements 
+    if (props[reactSupport.classNameProp] && isCustomElement(node.name)) {
+        props[classAttr] = props[reactSupport.classNameProp];
+        delete props[reactSupport.classNameProp];  
+    }
+
     const propStr = _.map(props, (v, k) => `${JSON.stringify(k)} : ${v}`).join(',');
     return `{${propStr}}`;
 }
@@ -251,15 +309,18 @@ function convertTagNameToConstructor(tagName, context) {
     if (context.options.native) {
         const targetSupport = reactNativeSupport[context.options.nativeTargetVersion];
         return _.includes(targetSupport.components, tagName) ? `${targetSupport.reactNative.name}.${tagName}` : tagName;
-    }
-    let isHtmlTag = _.includes(reactDOMSupport[context.options.targetVersion], tagName);
-    if (reactSupport.shouldUseCreateElement(context)) {
-        isHtmlTag = isHtmlTag || tagName.match(/^\w+(-\w+)$/);
+    }     
+    const isHtmlTag = _.includes(reactDOMSupport[context.options.targetVersion], tagName) || isCustomElement(tagName); 
+    if (reactSupport.shouldUseCreateElement(context)) {        
         return isHtmlTag ? `'${tagName}'` : tagName;
     }
     return isHtmlTag ? 'React.DOM.' + tagName : tagName;
 }
 
+function isCustomElement(tagName) {
+    return tagName.match(/^\w+(-\w+)+$/);
+}
+
 /**
  * @param {string} html
  * @param options
@@ -267,16 +328,23 @@ function convertTagNameToConstructor(tagName, context) {
  * @return {Context}
  */
 function defaultContext(html, options, reportContext) {
-    const defaultDefines = [
-        {moduleName: options.reactImportPath, alias: 'React', member: '*'},
-        {moduleName: options.lodashImportPath, alias: '_', member: '*'}
-    ];
+    const createElement = parseCreateElementAlias(options);
+
+    const defaultDefines = [];
+
+    if (createElement) {
+        defaultDefines.push({moduleName: options.reactImportPath, alias: createElement.alias, member: createElement.name});
+    } else {
+        defaultDefines.push({moduleName: options.reactImportPath, alias: 'React', member: '*'});
+    }
+
     if (options.native) {
         const targetSupport = reactNativeSupport[options.nativeTargetVersion];
         if (targetSupport.reactNative.module !== targetSupport.react.module) {
             defaultDefines.splice(0, 0, {moduleName: targetSupport.reactNative.module, alias: targetSupport.reactNative.name, member: '*'});
         }
     }
+
     return {
         boundParams: [],
         injectedFunctions: [],
@@ -378,12 +446,11 @@ function convertHtmlToReact(node, context) {
             if (data.props === '{}') {
                 data.props = node.attribs[propsAttr];
             } else if (!node.attribs.style && !node.attribs.class) {
+                requireHelper('__rtassign', context);
                 data.props = propsTemplateSimple({generatedProps: data.props, rtProps: node.attribs[propsAttr]});
             } else {
+                requireHelper('__rtmergeprops', context);
                 data.props = propsTemplate({generatedProps: data.props, rtProps: node.attribs[propsAttr]});
-                if (!_.includes(context.injectedFunctions, propsMergeFunction)) {
-                    context.injectedFunctions.push(propsMergeFunction);
-                }
             }
         }
 
@@ -416,7 +483,8 @@ function convertHtmlToReact(node, context) {
         if (node.name === virtualNode) { //eslint-disable-line wix-editor/prefer-ternary
             data.body = `[${_.compact(children).join(',')}]`;
         } else {
-            data.body = _.template(getTagTemplateString(!hasNonSimpleChildren(node), reactSupport.shouldUseCreateElement(context)))(data);
+            const templateString = getTagTemplateString(!hasNonSimpleChildren(node), reactSupport.shouldUseCreateElement(context), context.options);
+            data.body = _.template(templateString)(data);
         }
 
         if (node.attribs[scopeAttr]) {
@@ -431,6 +499,7 @@ function convertHtmlToReact(node, context) {
             data.repeatFunction = generateInjectedFunc(context, 'repeat' + _.upperFirst(data.item), 'return ' + data.body);
             data.repeatBinds = ['this'].concat(_.reject(context.boundParams, p => p === data.item || p === data.index || data.innerScope && p in data.innerScope.innerMapping));
             data.body = repeatTemplate(data);
+            requireHelper('__rtmap', context);
         }
         if (node.attribs[ifAttr]) {
             data.body = ifTemplate(data);
@@ -448,6 +517,44 @@ function convertHtmlToReact(node, context) {
     }
 }
 
+/**
+ * Parses the rt-scope attribute returning an array of parsed sections
+ *
+ * @param {String} scope The scope attribute to parse
+ * @returns {Array} an array of {expression,identifier}
+ * @throws {String} the part of the string that failed to parse
+ */
+function parseScopeSyntax(text) {
+    // the regex below was built using the following pseudo-code:
+    // double_quoted_string = `"[^"\\\\]*(?:\\\\.[^"\\\\]*)*"`
+    // single_quoted_string = `'[^'\\\\]*(?:\\\\.[^'\\\\]*)*'`
+    // text_out_of_quotes = `[^"']*?`
+    // expr_parts = double_quoted_string + "|" + single_quoted_string + "|" + text_out_of_quotes
+    // expression = zeroOrMore(nonCapture(expr_parts)) + "?"
+    // id = "[$_a-zA-Z]+[$_a-zA-Z0-9]*"
+    // as = " as" + OneOrMore(" ")
+    // optional_spaces = zeroOrMore(" ")
+    // semicolon = nonCapture(or(text(";"), "$"))
+    //
+    // regex = capture(expression) + as + capture(id) + optional_spaces + semicolon + optional_spaces
+
+    const regex = RegExp("((?:(?:\"[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*\"|'[^'\\\\]*(?:\\\\.[^'\\\\]*)*'|[^\"']*?))*?) as(?: )+([$_a-zA-Z]+[$_a-zA-Z0-9]*)(?: )*(?:;|$)(?: )*", 'g');
+    const res = [];
+    do {
+        const idx = regex.lastIndex;
+        const match = regex.exec(text);
+        if (regex.lastIndex === idx || match === null || match.index !== idx) {
+            throw text.substr(idx);
+        }
+        if (match.index === regex.lastIndex) {
+            regex.lastIndex++;
+        }
+        res.push({expression: match[1].trim(), identifier: match[2]});
+    } while (regex.lastIndex < text.length);
+
+    return res;
+}
+
 function handleScopeAttribute(node, context, data) {
     data.innerScope = {
         scopeName: '',
@@ -457,25 +564,26 @@ function handleScopeAttribute(node, context, data) {
 
     data.innerScope.outerMapping = _.zipObject(context.boundParams, context.boundParams);
 
-    _(node.attribs[scopeAttr]).split(';').invokeMap('trim').compact().forEach(scopePart => {
-        const scopeSubParts = _(scopePart).split(' as ').invokeMap('trim').value();
-        if (scopeSubParts.length < 2) {
-            throw RTCodeError.build(context, node, `invalid scope part '${scopePart}'`);
-        }
-        const alias = scopeSubParts[1];
-        const value = scopeSubParts[0];
-        validateJS(alias, node, context);
+    let scopes;
+    try {
+        scopes = parseScopeSyntax(node.attribs[scopeAttr]);
+    } catch (scopePart) {
+        throw RTCodeError.build(context, node, `invalid scope part '${scopePart}'`);
+    }
+
+    scopes.forEach(({expression, identifier}) => {
+        validateJS(identifier, node, context);
 
         // this adds both parameters to the list of parameters passed further down
         // the scope chain, as well as variables that are locally bound before any
         // function call, as with the ones we generate for rt-scope.
-        if (!_.includes(context.boundParams, alias)) {
-            context.boundParams.push(alias);
+        if (!_.includes(context.boundParams, identifier)) {
+            context.boundParams.push(identifier);
         }
 
-        data.innerScope.scopeName += _.upperFirst(alias);
-        data.innerScope.innerMapping[alias] = `var ${alias} = ${value};`;
-        validateJS(data.innerScope.innerMapping[alias], node, context);
+        data.innerScope.scopeName += _.upperFirst(identifier);
+        data.innerScope.innerMapping[identifier] = `var ${identifier} = ${expression};`;
+        validateJS(data.innerScope.innerMapping[identifier], node, context);
     });
 }
 
@@ -550,7 +658,10 @@ function handleImport(tag, context) {
     if (!moduleName) {
         throw RTCodeError.build(context, tag, `'${importAttr}' needs 'name' and 'from' attributes`);
     }
-    context.defines.push({moduleName, member, alias});
+    const def = {moduleName, member, alias};
+    if (!_.some(context.defines, def)) {
+        context.defines.push(def);
+    }
 }
 
 function convertTemplateToReact(html, options) {
@@ -604,6 +715,7 @@ function parseAndConvertHtmlToReact(html, context) {
  */
 function convertRT(html, reportContext, options) {
     options = getOptions(options);
+    assignHelpers(options);
 
     const context = defaultContext(html, options, reportContext);
     const body = parseAndConvertHtmlToReact(html, context);
@@ -653,6 +765,7 @@ function parseJS(code, options) {
 
 function convertJSRTToJS(text, reportContext, options) {
     options = getOptions(options);
+    assignHelpers(options);
     options.modules = 'jsrt';
     const templateMatcherJSRT = /<template>([^]*?)<\/template>/gm;
     const code = text.replace(templateMatcherJSRT, (template, html) => convertRT(html, reportContext, options).replace(/;$/, ''));
diff --git a/test/data/comment.rt.amd.js b/test/data/comment.rt.amd.js
index 10930ae4..475ead19 100644
--- a/test/data/comment.rt.amd.js
+++ b/test/data/comment.rt.amd.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         return React.createElement('div', {}    /*  this is a comment  */, React.createElement('div', {}, 'hello')    /*  /* this is another comment * /  */, React.createElement('div', {}, 'hello'));
diff --git a/test/data/comment.rt.es6.js b/test/data/comment.rt.es6.js
index 97548467..b6ba8f75 100644
--- a/test/data/comment.rt.es6.js
+++ b/test/data/comment.rt.es6.js
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import * as _ from 'lodash';
 export default function () {
     return React.createElement('div', {}, React.createElement('div', {}, 'hello'), React.createElement('div', {}, 'hello'));
 }
\ No newline at end of file
diff --git a/test/data/createElement.rt b/test/data/createElement.rt
new file mode 100644
index 00000000..5e148697
--- /dev/null
+++ b/test/data/createElement.rt
@@ -0,0 +1 @@
+<div><span>Hello</span></div>
diff --git a/test/data/createElement.rt.1.amd.js b/test/data/createElement.rt.1.amd.js
new file mode 100644
index 00000000..2cd925cf
--- /dev/null
+++ b/test/data/createElement.rt.1.amd.js
@@ -0,0 +1,7 @@
+define(['preact'], function ($0) {
+    'use strict';
+    var h = $0.h;
+    return function () {
+        return h('div', {}, h('span', {}, 'Hello'));
+    };
+});
\ No newline at end of file
diff --git a/test/data/createElement.rt.1.commonjs.js b/test/data/createElement.rt.1.commonjs.js
new file mode 100644
index 00000000..7cf0ee8a
--- /dev/null
+++ b/test/data/createElement.rt.1.commonjs.js
@@ -0,0 +1,5 @@
+'use strict';
+var h = require('preact').h;
+module.exports = function () {
+    return h('div', {}, h('span', {}, 'Hello'));
+};
\ No newline at end of file
diff --git a/test/data/createElement.rt.amd.js b/test/data/createElement.rt.amd.js
new file mode 100644
index 00000000..e1b7f2a2
--- /dev/null
+++ b/test/data/createElement.rt.amd.js
@@ -0,0 +1,7 @@
+define(['react'], function ($0) {
+    'use strict';
+    var h = $0.createElement;
+    return function () {
+        return h('div', {}, h('span', {}, 'Hello'));
+    };
+});
\ No newline at end of file
diff --git a/test/data/createElement.rt.commonjs.js b/test/data/createElement.rt.commonjs.js
new file mode 100644
index 00000000..6fc0b078
--- /dev/null
+++ b/test/data/createElement.rt.commonjs.js
@@ -0,0 +1,5 @@
+'use strict';
+var h = require('react').createElement;
+module.exports = function () {
+    return h('div', {}, h('span', {}, 'Hello'));
+};
\ No newline at end of file
diff --git a/test/data/custom-element.rt b/test/data/custom-element.rt
index dbeead7d..90e1a8ba 100644
--- a/test/data/custom-element.rt
+++ b/test/data/custom-element.rt
@@ -1,3 +1,4 @@
 <div>
     <custom-element></custom-element>
+    <my-custom-element class="a" className="b" rt-class="{c:1}" rt-props="{d:2}"></my-custom-element>
 </div>
diff --git a/test/data/custom-element.rt.html b/test/data/custom-element.rt.html
index b57a8c4c..b37eed20 100644
--- a/test/data/custom-element.rt.html
+++ b/test/data/custom-element.rt.html
@@ -1 +1 @@
-<div><custom-element></custom-element></div>
+<div><custom-element></custom-element><my-custom-element class="a b c" d="2"></my-custom-element></div>
diff --git a/test/data/div.rt.amd.js b/test/data/div.rt.amd.js
index 076b2c2e..3f8e3cb3 100644
--- a/test/data/div.rt.amd.js
+++ b/test/data/div.rt.amd.js
@@ -1,7 +1,4 @@
-define('div', [
-    'react',
-    'lodash'
-], function (React, _) {
+define('div', ['react'], function (React) {
     'use strict';
     return function () {
         return React.createElement('div', {});
diff --git a/test/data/div.rt.commonjs.js b/test/data/div.rt.commonjs.js
index f822228f..a5622d49 100644
--- a/test/data/div.rt.commonjs.js
+++ b/test/data/div.rt.commonjs.js
@@ -1,6 +1,5 @@
 'use strict';
 var React = require('react');
-var _ = require('lodash');
 module.exports = function () {
     return React.createElement('div', {});
 };
diff --git a/test/data/div.rt.es6.js b/test/data/div.rt.es6.js
index 8a6d4ea8..34faf574 100644
--- a/test/data/div.rt.es6.js
+++ b/test/data/div.rt.es6.js
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import * as _ from 'lodash';
 export default function () {
     return React.createElement('div', {});
 }
diff --git a/test/data/div.rt.js b/test/data/div.rt.js
index 8a94252a..907e3fb4 100644
--- a/test/data/div.rt.js
+++ b/test/data/div.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         return React.createElement('div', {});
diff --git a/test/data/div.rt.typescript.ts b/test/data/div.rt.typescript.ts
index 436ad5d3..6ada01f4 100644
--- a/test/data/div.rt.typescript.ts
+++ b/test/data/div.rt.typescript.ts
@@ -1,4 +1,3 @@
 import React = require('react');
-import _ = require('lodash');
 export = function() { return React.createElement('div',{}) };
 
diff --git a/test/data/externalHelpers.rt b/test/data/externalHelpers.rt
new file mode 100644
index 00000000..866a26b7
--- /dev/null
+++ b/test/data/externalHelpers.rt
@@ -0,0 +1,13 @@
+<div>
+   <!-- tests __rtmap helper -->
+   <div rt-repeat="a in [1,2,3]">{a}</div>
+
+   <!-- tests __rtassign helper -->
+   <ChildComp rt-props="{a:1, b:2}" c="3"></ChildComp>
+   
+   <!-- tests __rtmergeprops helper -->
+   <ChildComp style="height:10px;width:3px;" rt-props="{style:{width:'5px'}, type:'text', className: 'clsB'}" class="clsA"></ChildComp>
+
+   <!-- tests __rtclass helper -->
+   <div rt-class="{a:true, b:true}"></div>
+</div>
diff --git a/test/data/externalHelpers.rt.amd.js b/test/data/externalHelpers.rt.amd.js
new file mode 100644
index 00000000..c9cc7072
--- /dev/null
+++ b/test/data/externalHelpers.rt.amd.js
@@ -0,0 +1,48 @@
+define([
+    'react',
+    'react-templates-helpers',
+    'react-templates-helpers',
+    'react-templates-helpers',
+    'react-templates-helpers'
+], function (React, $1, $2, $3, $4) {
+    'use strict';
+    var __rtmap = $1.__rtmap;
+    var __rtassign = $2.__rtassign;
+    var __rtmergeprops = $3.__rtmergeprops;
+    var __rtclass = $4.__rtclass;
+    return function () {
+        function repeatA1(a, aIndex) {
+            return React.createElement('div', {}, a);
+        }
+        return React.createElement.apply(this, [
+            'div',
+            {}    /*  tests __rtmap helper  */,
+            __rtmap([
+                1,
+                2,
+                3
+            ], repeatA1.bind(this))    /*  tests __rtassign helper  */,
+            React.createElement(ChildComp, __rtassign({}, { 'c': '3' }, {
+                a: 1,
+                b: 2
+            }))    /*  tests __rtmergeprops helper  */,
+            React.createElement(ChildComp, __rtmergeprops({
+                'style': {
+                    height: '10px',
+                    width: '3px'
+                },
+                'className': 'clsA'
+            }, {
+                style: { width: '5px' },
+                type: 'text',
+                className: 'clsB'
+            }))    /*  tests __rtclass helper  */,
+            React.createElement('div', {
+                'className': __rtclass({
+                    a: true,
+                    b: true
+                })
+            })
+        ]);
+    };
+});
\ No newline at end of file
diff --git a/test/data/externalHelpers.rt.commonjs.js b/test/data/externalHelpers.rt.commonjs.js
new file mode 100644
index 00000000..09d717f3
--- /dev/null
+++ b/test/data/externalHelpers.rt.commonjs.js
@@ -0,0 +1,41 @@
+'use strict';
+var React = require('react');
+var __rtmap = require('react-templates-helpers').__rtmap;
+var __rtassign = require('react-templates-helpers').__rtassign;
+var __rtmergeprops = require('react-templates-helpers').__rtmergeprops;
+var __rtclass = require('react-templates-helpers').__rtclass;
+module.exports = function () {
+    function repeatA1(a, aIndex) {
+        return React.createElement('div', {}, a);
+    }
+    return React.createElement.apply(this, [
+        'div',
+        {}    /*  tests __rtmap helper  */,
+        __rtmap([
+            1,
+            2,
+            3
+        ], repeatA1.bind(this))    /*  tests __rtassign helper  */,
+        React.createElement(ChildComp, __rtassign({}, { 'c': '3' }, {
+            a: 1,
+            b: 2
+        }))    /*  tests __rtmergeprops helper  */,
+        React.createElement(ChildComp, __rtmergeprops({
+            'style': {
+                height: '10px',
+                width: '3px'
+            },
+            'className': 'clsA'
+        }, {
+            style: { width: '5px' },
+            type: 'text',
+            className: 'clsB'
+        }))    /*  tests __rtclass helper  */,
+        React.createElement('div', {
+            'className': __rtclass({
+                a: true,
+                b: true
+            })
+        })
+    ]);
+};
\ No newline at end of file
diff --git a/test/data/externalHelpers.rt.noHelpers.amd.js b/test/data/externalHelpers.rt.noHelpers.amd.js
new file mode 100644
index 00000000..c656cd25
--- /dev/null
+++ b/test/data/externalHelpers.rt.noHelpers.amd.js
@@ -0,0 +1,55 @@
+define([
+    'react',
+    'lodash'
+], function (React, _) {
+    'use strict';
+    return function () {
+        function repeatA1(a, aIndex) {
+            return React.createElement('div', {}, a);
+        }
+        function mergeProps(inline, external) {
+            var res = _.assign({}, inline, external);
+            if (inline.hasOwnProperty('style')) {
+                res.style = _.defaults(res.style, inline.style);
+            }
+            if (inline.hasOwnProperty('className') && external.hasOwnProperty('className')) {
+                res.className = external.className + ' ' + inline.className;
+            }
+            return res;
+        }
+        return React.createElement.apply(this, [
+            'div',
+            {}    /*  tests __rtmap helper  */,
+            _.map([
+                1,
+                2,
+                3
+            ], repeatA1.bind(this))    /*  tests __rtassign helper  */,
+            React.createElement(ChildComp, _.assign({}, { 'c': '3' }, {
+                a: 1,
+                b: 2
+            }))    /*  tests __rtmergeprops helper  */,
+            React.createElement(ChildComp, mergeProps({
+                'style': {
+                    height: '10px',
+                    width: '3px'
+                },
+                'className': 'clsA'
+            }, {
+                style: { width: '5px' },
+                type: 'text',
+                className: 'clsB'
+            }))    /*  tests __rtclass helper  */,
+            React.createElement('div', {
+                'className': _.transform({
+                    a: true,
+                    b: true
+                }, function (res, value, key) {
+                    if (value) {
+                        res.push(key);
+                    }
+                }, []).join(' ')
+            })
+        ]);
+    };
+});
\ No newline at end of file
diff --git a/test/data/externalHelpers.rt.noHelpers.commonjs.js b/test/data/externalHelpers.rt.noHelpers.commonjs.js
new file mode 100644
index 00000000..06b7a8b1
--- /dev/null
+++ b/test/data/externalHelpers.rt.noHelpers.commonjs.js
@@ -0,0 +1,52 @@
+'use strict';
+var React = require('react');
+var _ = require('lodash');
+module.exports = function () {
+    function repeatA1(a, aIndex) {
+        return React.createElement('div', {}, a);
+    }
+    function mergeProps(inline, external) {
+        var res = _.assign({}, inline, external);
+        if (inline.hasOwnProperty('style')) {
+            res.style = _.defaults(res.style, inline.style);
+        }
+        if (inline.hasOwnProperty('className') && external.hasOwnProperty('className')) {
+            res.className = external.className + ' ' + inline.className;
+        }
+        return res;
+    }
+    return React.createElement.apply(this, [
+        'div',
+        {}    /*  tests __rtmap helper  */,
+        _.map([
+            1,
+            2,
+            3
+        ], repeatA1.bind(this))    /*  tests __rtassign helper  */,
+        React.createElement(ChildComp, _.assign({}, { 'c': '3' }, {
+            a: 1,
+            b: 2
+        }))    /*  tests __rtmergeprops helper  */,
+        React.createElement(ChildComp, mergeProps({
+            'style': {
+                height: '10px',
+                width: '3px'
+            },
+            'className': 'clsA'
+        }, {
+            style: { width: '5px' },
+            type: 'text',
+            className: 'clsB'
+        }))    /*  tests __rtclass helper  */,
+        React.createElement('div', {
+            'className': _.transform({
+                a: true,
+                b: true
+            }, function (res, value, key) {
+                if (value) {
+                    res.push(key);
+                }
+            }, []).join(' ')
+        })
+    ]);
+};
\ No newline at end of file
diff --git a/test/data/if-with-scope/valid-if-scope.rt.js b/test/data/if-with-scope/valid-if-scope.rt.js
index 5e0666fb..96ca9765 100644
--- a/test/data/if-with-scope/valid-if-scope.rt.js
+++ b/test/data/if-with-scope/valid-if-scope.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         function scopeActiveUsers1() {
diff --git a/test/data/import-duplicate.rt b/test/data/import-duplicate.rt
new file mode 100644
index 00000000..1d1601e1
--- /dev/null
+++ b/test/data/import-duplicate.rt
@@ -0,0 +1,4 @@
+<rt-import name="*" as="_" from="lodash"/>
+<div>
+   <span rt-repeat="a in [1,2,3]">{a}</span>
+</div>
diff --git a/test/data/import-duplicate.rt.js b/test/data/import-duplicate.rt.js
new file mode 100644
index 00000000..d3f337e2
--- /dev/null
+++ b/test/data/import-duplicate.rt.js
@@ -0,0 +1,20 @@
+define([
+    'react',
+    'lodash'
+], function (React, _) {
+    'use strict';
+    return function () {
+        function repeatA1(a, aIndex) {
+            return React.createElement('span', {}, a);
+        }
+        return React.createElement.apply(this, [
+            'div',
+            {},
+            _.map([
+                1,
+                2,
+                3
+            ], repeatA1.bind(this))
+        ]);
+    };
+});
diff --git a/test/data/import.rt.amd.js b/test/data/import.rt.amd.js
index 5a7b69f5..0a120e20 100644
--- a/test/data/import.rt.amd.js
+++ b/test/data/import.rt.amd.js
@@ -1,15 +1,14 @@
 define('div', [
     'react',
-    'lodash',
     'module-name',
     'module-name',
     'module-name',
     'module-name'
-], function (React, _, $2, $3, alias3, $5) {
+], function (React, $1, $2, alias3, $4) {
     'use strict';
-    var member = $2.member;
-    var alias2 = $3.member;
-    var alias4 = $5.default;
+    var member = $1.member;
+    var alias2 = $2.member;
+    var alias4 = $4.default;
     return function () {
         return React.createElement('div', {});
     };
diff --git a/test/data/import.rt.commonjs.js b/test/data/import.rt.commonjs.js
index 22fcf633..78d527ee 100644
--- a/test/data/import.rt.commonjs.js
+++ b/test/data/import.rt.commonjs.js
@@ -1,6 +1,5 @@
 'use strict';
 var React = require('react');
-var _ = require('lodash');
 var member = require('module-name').member;
 var alias2 = require('module-name').member;
 var alias3 = require('module-name');
diff --git a/test/data/import.rt.es6.js b/test/data/import.rt.es6.js
index 30586d04..2734c986 100644
--- a/test/data/import.rt.es6.js
+++ b/test/data/import.rt.es6.js
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import * as _ from 'lodash';
 import { member } from 'module-name';
 import { member as alias2 } from 'module-name';
 import * as alias3 from 'module-name';
diff --git a/test/data/import.rt.typescript.ts b/test/data/import.rt.typescript.ts
index ad39a5e6..ccad9e2b 100644
--- a/test/data/import.rt.typescript.ts
+++ b/test/data/import.rt.typescript.ts
@@ -1,8 +1,6 @@
 import React = require('react');
-import _ = require('lodash');
 import { member as member } from 'module-name';
 import { member as alias2 } from 'module-name';
 import alias3 = require('module-name');
 import alias4 from 'module-name';
 export = function() { return React.createElement('div',{}) };
-
diff --git a/test/data/inputs.rt.js b/test/data/inputs.rt.js
index 67548d47..2c079e58 100644
--- a/test/data/inputs.rt.js
+++ b/test/data/inputs.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         return React.createElement('div', {}, React.createElement('input', {
diff --git a/test/data/native/listViewAndCustomTemplate.rt.js b/test/data/native/listViewAndCustomTemplate.rt.js
index 1fb714d3..9154c18d 100644
--- a/test/data/native/listViewAndCustomTemplate.rt.js
+++ b/test/data/native/listViewAndCustomTemplate.rt.js
@@ -1,6 +1,5 @@
 'use strict';
 var React = require('react-native');
-var _ = require('lodash');
 module.exports = function () {
     function renderRow1(rowData) {
         return React.createElement(React.Text, {}, rowData);
diff --git a/test/data/native/listViewAndCustomTemplate.rt.v029.js b/test/data/native/listViewAndCustomTemplate.rt.v029.js
index c2aec7bf..0d2ec51b 100644
--- a/test/data/native/listViewAndCustomTemplate.rt.v029.js
+++ b/test/data/native/listViewAndCustomTemplate.rt.v029.js
@@ -1,7 +1,6 @@
 'use strict';
 var ReactNative = require('react-native');
 var React = require('react');
-var _ = require('lodash');
 module.exports = function () {
     function renderRow1(rowData) {
         return React.createElement(ReactNative.Text, {}, rowData);
diff --git a/test/data/native/listViewTemplate.rt.js b/test/data/native/listViewTemplate.rt.js
index 037dff53..e376a638 100644
--- a/test/data/native/listViewTemplate.rt.js
+++ b/test/data/native/listViewTemplate.rt.js
@@ -1,6 +1,5 @@
 'use strict';
 var React = require('react-native');
-var _ = require('lodash');
 module.exports = function () {
     function renderRow1(rowData) {
         return React.createElement(React.Text, {}, rowData);
diff --git a/test/data/native/listViewTemplate.rt.v029.js b/test/data/native/listViewTemplate.rt.v029.js
index 124fd5df..61891607 100644
--- a/test/data/native/listViewTemplate.rt.v029.js
+++ b/test/data/native/listViewTemplate.rt.v029.js
@@ -1,7 +1,6 @@
 'use strict';
 var ReactNative = require('react-native');
 var React = require('react');
-var _ = require('lodash');
 module.exports = function () {
     function renderRow1(rowData) {
         return React.createElement(ReactNative.Text, {}, rowData);
diff --git a/test/data/native/nativeView.rt.js b/test/data/native/nativeView.rt.js
index 61eb17b2..4f264555 100644
--- a/test/data/native/nativeView.rt.js
+++ b/test/data/native/nativeView.rt.js
@@ -1,6 +1,5 @@
 'use strict';
 var React = require('react-native');
-var _ = require('lodash');
 module.exports = function () {
     return React.createElement(React.View, {});
 };
\ No newline at end of file
diff --git a/test/data/native/nativeView.rt.v029.js b/test/data/native/nativeView.rt.v029.js
index 9095fa08..55c27ab6 100644
--- a/test/data/native/nativeView.rt.v029.js
+++ b/test/data/native/nativeView.rt.v029.js
@@ -1,7 +1,6 @@
 'use strict';
 var ReactNative = require('react-native');
 var React = require('react');
-var _ = require('lodash');
 module.exports = function () {
     return React.createElement(ReactNative.View, {});
 };
\ No newline at end of file
diff --git a/test/data/non-breaking-space.rt.js b/test/data/non-breaking-space.rt.js
index 11375d01..4699195c 100644
--- a/test/data/non-breaking-space.rt.js
+++ b/test/data/non-breaking-space.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         return React.createElement('div', {}, '\xA0');
diff --git a/test/data/propTemplates/implicitTemplate.rt.js b/test/data/propTemplates/implicitTemplate.rt.js
index bf6b3173..1ed94f9b 100644
--- a/test/data/propTemplates/implicitTemplate.rt.js
+++ b/test/data/propTemplates/implicitTemplate.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         function renderRow1(rowData) {
diff --git a/test/data/propTemplates/siblingTemplates.rt.js b/test/data/propTemplates/siblingTemplates.rt.js
index 53cfcd62..88fc0575 100644
--- a/test/data/propTemplates/siblingTemplates.rt.js
+++ b/test/data/propTemplates/siblingTemplates.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         function templateProp11(brother) {
diff --git a/test/data/propTemplates/simpleTemplate.rt.js b/test/data/propTemplates/simpleTemplate.rt.js
index 5eb19be5..e61f7394 100644
--- a/test/data/propTemplates/simpleTemplate.rt.js
+++ b/test/data/propTemplates/simpleTemplate.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         function templateProp1(arg1) {
diff --git a/test/data/propTemplates/templateInScope.rt.js b/test/data/propTemplates/templateInScope.rt.js
index bad8843e..59d4c7bb 100644
--- a/test/data/propTemplates/templateInScope.rt.js
+++ b/test/data/propTemplates/templateInScope.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         function templateProp1(name, arg1) {
diff --git a/test/data/propTemplates/twoTemplates.rt.js b/test/data/propTemplates/twoTemplates.rt.js
index 1b3bf14d..e846d1b0 100644
--- a/test/data/propTemplates/twoTemplates.rt.js
+++ b/test/data/propTemplates/twoTemplates.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         function templateProp21(arg1, inner1, inner2) {
diff --git a/test/data/require.rt.amd.js b/test/data/require.rt.amd.js
index af739884..92615de7 100644
--- a/test/data/require.rt.amd.js
+++ b/test/data/require.rt.amd.js
@@ -1,9 +1,8 @@
 define('div', [
     'react',
-    'lodash',
     'comps/myComp',
     'utils/utils'
-], function (React, _, myComp, utils) {
+], function (React, myComp, utils) {
     'use strict';
     return function () {
         return React.createElement(myComp, {}, '\n', utils.translate('Hello', 'es'), '\n');
diff --git a/test/data/require.rt.commonjs.js b/test/data/require.rt.commonjs.js
index ce218ade..9926a33b 100644
--- a/test/data/require.rt.commonjs.js
+++ b/test/data/require.rt.commonjs.js
@@ -1,6 +1,5 @@
 'use strict';
 var React = require('react');
-var _ = require('lodash');
 var myComp = require('comps/myComp');
 var utils = require('utils/utils');
 module.exports = function () {
diff --git a/test/data/require.rt.es6.js b/test/data/require.rt.es6.js
index 1a65da1c..44e3b2f8 100644
--- a/test/data/require.rt.es6.js
+++ b/test/data/require.rt.es6.js
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import * as _ from 'lodash';
 import * as myComp from 'comps/myComp';
 import * as utils from 'utils/utils';
 export default function () {
diff --git a/test/data/require.rt.typescript.ts b/test/data/require.rt.typescript.ts
index ba3e6d82..24ab7b02 100644
--- a/test/data/require.rt.typescript.ts
+++ b/test/data/require.rt.typescript.ts
@@ -1,5 +1,4 @@
 import React = require('react');
-import _ = require('lodash');
 import myComp = require('comps/myComp');
 import utils = require('utils/utils');
 export = function() { return React.createElement(myComp,{},"\n",(utils.translate('Hello','es')),"\n") };
diff --git a/test/data/scope-reserved-tokens.rt b/test/data/scope-reserved-tokens.rt
new file mode 100644
index 00000000..7b4dfcb5
--- /dev/null
+++ b/test/data/scope-reserved-tokens.rt
@@ -0,0 +1,4 @@
+<div rt-scope="'x as id;' as id;'y\'y as id2' as id2">
+	{id}{id2}
+</div>
+
diff --git a/test/data/scope-reserved-tokens.rt.html b/test/data/scope-reserved-tokens.rt.html
new file mode 100644
index 00000000..68fd095e
--- /dev/null
+++ b/test/data/scope-reserved-tokens.rt.html
@@ -0,0 +1,2 @@
+<div>x as id;y&apos;y as id2</div>
+
diff --git a/test/data/stateless.rt.js b/test/data/stateless.rt.js
index 5df53d12..c0cc3da2 100644
--- a/test/data/stateless.rt.js
+++ b/test/data/stateless.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function (props, context) {
         return React.createElement('div', {}, 'Hello ', props.person);
diff --git a/test/data/style-vendor-prefix.rt.js b/test/data/style-vendor-prefix.rt.js
index 9b214aea..f411b9ce 100644
--- a/test/data/style-vendor-prefix.rt.js
+++ b/test/data/style-vendor-prefix.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         return React.createElement('div', {}, React.createElement('span', {
diff --git a/test/data/test.rt.js b/test/data/test.rt.js
index 2c7dedd2..9aa10972 100644
--- a/test/data/test.rt.js
+++ b/test/data/test.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         return React.createElement('div', {}, React.createElement('div', {
diff --git a/test/data/whitespace.rt.js b/test/data/whitespace.rt.js
index 7c0dc76c..f0a9af7a 100644
--- a/test/data/whitespace.rt.js
+++ b/test/data/whitespace.rt.js
@@ -1,7 +1,4 @@
-define([
-    'react',
-    'lodash'
-], function (React, _) {
+define(['react'], function (React) {
     'use strict';
     return function () {
         return React.createElement('div', {}, React.createElement('div', {}, ' This is a ', this.props.name, ' example '), React.createElement('div', {}, ' \xA0 '), React.createElement('div', {}, '    aaa    '), React.createElement('pre', {}, '\n        This   is  a\n        ', this.props.name, '\n        example\n    '), React.createElement('textarea', {}, '\n        This   is  a\n        ', this.props.name, '\n        example\n    ', React.createElement('textarea', {}, React.createElement('div', {}, '\n        This   is  a\n        ', this.props.name, '\n        example\n    \n'))));
diff --git a/test/src/rt-html-valid.spec.js b/test/src/rt-html-valid.spec.js
index 3d75c0cc..5c2f814f 100644
--- a/test/src/rt-html-valid.spec.js
+++ b/test/src/rt-html-valid.spec.js
@@ -1,9 +1,7 @@
 'use strict';
-// const _ = require('lodash');
 const reactTemplates = require('../../src/reactTemplates');
 const testUtils = require('./testUtils');
 const readFileNormalized = testUtils.readFileNormalized;
-const compareAndWriteHtml = testUtils.compareAndWriteHtml;
 const path = require('path');
 const fsUtil = require('../../src/fsUtil');
 const fs = require('fs');
@@ -31,10 +29,10 @@ module.exports = {
                 'scope-evaluated-after-repeat2.rt',
                 'scope-evaluated-after-if.rt',
                 'scope-obj.rt',
+                'scope-reserved-tokens.rt',
                 'repeat-literal-collection.rt',
                 'include.rt'
-            ];
-            // t.plan(files.length);
+            ];            
 
             files.forEach(testFile => {
                 const filename = path.join(dataPath, testFile);
@@ -42,21 +40,21 @@ module.exports = {
                     readFileSync: fsUtil.createRelativeReadFileSync(filename),
                     modules: 'amd'
                 };
-                let code = '';
+                let actual = '';
+                let equal = false;
                 try {
                     const html = fs.readFileSync(filename).toString();
                     const expected = testUtils.normalizeHtml(readFileNormalized(filename + '.html'));
-                    code = reactTemplates.convertTemplateToReact(html, options).replace(/\r/g, '');
-                    const actual = testUtils.normalizeHtml(testUtils.codeToHtml(code));
-                    const equal = compareAndWriteHtml(t, actual, expected, filename);
-                    if (!equal) {
-                        fs.writeFileSync(filename + '.code.js', code);
-                    }
+                    const code = reactTemplates.convertTemplateToReact(html, options).replace(/\r/g, '');
+                    actual = testUtils.normalizeHtml(testUtils.codeToHtml(code));
+                    equal = t.equal(actual, expected);
                 } catch (e) {
-                    console.log(testFile, e);
-                    fs.writeFileSync(filename + '.code.js', code);
+                    console.log(testFile, e);                    
                     t.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.spec.js
index 3c98c0a6..d2f5bfab 100644
--- a/test/src/rt.invalid.spec.js
+++ b/test/src/rt.invalid.spec.js
@@ -20,7 +20,7 @@ module.exports = {
             {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 use {} to return a callback function. error: [onClick='']", 0, 23, 1, 1)},
-            {file: 'invalid-js.rt', issue: new RTCodeError('Unexpected token ILLEGAL', 0, 32, 1, 1)},
+            {file: 'invalid-js.rt', issue: new RTCodeError("invalid scope part 'x'a as v'", 0, 32, 1, 1)},
             {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)},
             {file: 'invalid-repeat-2.rt', issue: new RTCodeError("root element may not have a 'rt-repeat' attribute", 0, 39, 1, 1)},
diff --git a/test/src/rt.valid.spec.js b/test/src/rt.valid.spec.js
index 5eb01f7c..05121bd0 100644
--- a/test/src/rt.valid.spec.js
+++ b/test/src/rt.valid.spec.js
@@ -35,7 +35,7 @@ module.exports = {
         });
 
         test('conversion test', t => {
-            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 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', 'import-duplicate.rt'];
             const options = {modules: 'amd'};
             testFiles(t, files, options);
         });
@@ -109,6 +109,28 @@ module.exports = {
             files.forEach(file => check(t, file));
         });
 
+        test('convert option --create-element-alias', t => {
+            const files = [
+                {source: 'createElement.rt', expected: 'createElement.rt.commonjs.js', options: {modules: 'commonjs', createElementAlias: 'h'}},
+                {source: 'createElement.rt', expected: 'createElement.rt.amd.js', options: {modules: 'amd', createElementAlias: 'h'}},
+                {source: 'createElement.rt', expected: 'createElement.rt.1.commonjs.js', options: {modules: 'commonjs', createElementAlias: 'h,h', reactImportPath: 'preact'}},
+                {source: 'createElement.rt', expected: 'createElement.rt.1.amd.js', options: {modules: 'amd', createElementAlias: 'h,h', reactImportPath: 'preact'}}
+            ];
+            t.plan(files.length);
+            files.forEach(file => check(t, file));
+        });
+
+        test('convert option --external-helpers', t => {
+            const files = [
+                {source: 'externalHelpers.rt', expected: 'externalHelpers.rt.commonjs.js', options: {modules: 'commonjs', externalHelpers: 'react-templates-helpers'}},
+                {source: 'externalHelpers.rt', expected: 'externalHelpers.rt.amd.js', options: {modules: 'amd', externalHelpers: 'react-templates-helpers'}},
+                {source: 'externalHelpers.rt', expected: 'externalHelpers.rt.noHelpers.commonjs.js', options: {modules: 'commonjs'}},
+                {source: 'externalHelpers.rt', expected: 'externalHelpers.rt.noHelpers.amd.js', options: {modules: 'amd'}}
+            ];
+            t.plan(files.length);
+            files.forEach(file => check(t, file));
+        });
+
         test('rt-require with all module types', t => {
             const files = [
                 {source: 'require.rt', expected: 'require.rt.commonjs.js', options: {modules: 'commonjs'}},
diff --git a/test/src/rtStyle.spec.js b/test/src/rtStyle.spec.js
index 3235b811..e33f5810 100644
--- a/test/src/rtStyle.spec.js
+++ b/test/src/rtStyle.spec.js
@@ -3,7 +3,7 @@ const rtStyle = require('../../src/rtStyle');
 
 module.exports = {
     runTests(test) {
-        test('html tests', t => {
+        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);
diff --git a/test/src/test.js b/test/src/test.js
index 12cd47b5..7ed3b56a 100644
--- a/test/src/test.js
+++ b/test/src/test.js
@@ -3,7 +3,7 @@ const test = require('tape');
 const path = require('path');
 const dataPath = path.resolve(__dirname, '..', 'data');
 
-const specs = ['rt.invalid', 'rt.valid', 'utils', 'shell', 'rtStyle', 'fsUtil'];
+const specs = ['rt.invalid', 'rt.valid', 'rt-html-valid', 'utils', 'shell', 'rtStyle', 'fsUtil'];
 
 specs
     .map(file => require(`./${file}.spec`))
diff --git a/test/src/testUtils.js b/test/src/testUtils.js
index 364985c4..212c5dda 100644
--- a/test/src/testUtils.js
+++ b/test/src/testUtils.js
@@ -34,25 +34,6 @@ function compareAndWrite(t, actual, expected, filename) {
     return true;
 }
 
-/**
- * @param {*} t
- * @param {string} actual
- * @param {string} expected
- * @param {string} filename
- * @return {boolean} whether actual is equal to expected
- */
-function compareAndWriteHtml(t, actual, expected, filename) {
-    const $actual = cheerio.load(actual, {normalizeWhitespace: true});
-    const $expected = cheerio.load(expected, {normalizeWhitespace: true});
-    compareNodesList(t, $actual.root(), $expected.root(), filename);
-    // t.equal(actual, expected, filename);
-    // if (actual !== expected) {
-    //     fs.writeFileSync(filename + '.actual.js', actual);
-    //     return false;
-    // }
-    // return true;
-}
-
 function compareNodes(t, a, b, filename) {
     _.forEach(a.attribs, (v, k) => {
         if (v !== b.attribs[k]) {
@@ -117,6 +98,5 @@ module.exports = {
     readFile,
     joinDataPath,
     rtToHtml,
-    codeToHtml,
-    compareAndWriteHtml
+    codeToHtml
 };