diff --git a/.gitignore b/.gitignore
index 59f24406e..6fefaa005 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ dist/
 !css-value/**/*.*
 !fetch/**/*.*
 !apps/TelerikNEXT/lib/**/*.*
+!build/*.*
 CrossPlatformModules.sln.ide/
 *.suo
 CrossPlatformModules.suo
diff --git a/build/run-testsapp.grunt.js b/build/run-testsapp.grunt.js
new file mode 100644
index 000000000..678727570
--- /dev/null
+++ b/build/run-testsapp.grunt.js
@@ -0,0 +1,67 @@
+module.exports = {
+    run: function(grunt) {
+
+        var localCfg = {
+            emulatorProcessIdentifier:".*emulator64-x86",
+            emuAvdName:"Api19",
+            androidRuntimePath:"/Users/erjan/tns-android.tgz",
+            outfile:"./TestRunResult.txt",
+
+            workingDir=".testsapprun",
+            testsAppName:"TestsApp",
+            pathToApk:"./platforms/android/build/outputs/apk/TestsApp-debug.apk",
+            deployedAppName:"org.nativescript.$testsAppName",
+            mainActivityName:"com.tns.NativeScriptActivity"
+        }
+
+        grunt.initConfig({
+            clean: {
+                workingDir: {
+                    src: localCfg.workingDir
+                }
+            },
+            mkdir: {
+                workindDir: {
+                    options: {
+                        create [localCfg.workingDir],
+                        mode: 0700
+                    }
+                }
+            }
+            exec: {
+                killEmulator: {
+                    cmd: "pkill '" + localCfg.emulatorProcessIdentifier + "'",
+                    exitCode: [0, 1]
+                },
+                runTestsApp: {
+                    cmd: "./runtestsapp.sh",
+                    stdout: false,
+                    cwd: "../"
+                }
+            }
+        });
+
+//        grunt.loadNpmTasks("grunt-contrib-copy");
+//        grunt.loadNpmTasks("grunt-tslint");
+//        grunt.loadNpmTasks("grunt-multi-dest");
+//        grunt.loadNpmTasks("grunt-shell");
+//        grunt.loadNpmTasks("grunt-env");
+//        grunt.loadNpmTasks("grunt-simple-mocha");
+        grunt.loadNpmTasks("grunt-exec");
+        grunt.loadNpmTasks("grunt-mkdir");
+        grunt.loadNpmTasks("grunt-contrib-clean");
+
+        grunt.registerTask("testsapp", [
+                "clean:workingDir",
+                "mkdir:workingDir",
+                "exec:killEmulator",
+                "exec:runTestsApp",
+
+
+
+
+                "exec:killEmulator",
+                "clean:workingDir"
+        ]);
+    }
+}
diff --git a/gruntfile.js b/gruntfile.js
index ccf174b34..67b0d8a1c 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -1,567 +1,570 @@
 module.exports = function(grunt) {
-    var fs=require("fs");
-    var pathModule=require("path");
 
-    var filterTypeScriptFiles = function(content, srcPath) {
-        var matchRule = /^.*@private/ig;
-        if (matchRule.test(content))
-        {
-            return false;
-        }
-        var processed = content;
-        processed = processed.replace(/\/\/[\/\s]*@private((.|\s)*?)\/\/[\/\s]*@endprivate/gm, "");
-        return processed;
-    };
+    if (grunt.cli.tasks.indexOf("testsapp") >= 0) {
+        var tsTester = require("./build/run-testsapp.grunt.js");
+        tsTester.run(grunt);
+    } else {
 
-    var updatePackageDef = function(content, update)
-    {
-        var contentAsObject = JSON.parse(content);
-        update(contentAsObject);
-        return JSON.stringify(contentAsObject, null, "\t");
-    }
 
-    var updateModulesPackageDef = function(content, srcPath) {
-        return updatePackageDef(content, function(contentAsObject) {
-            contentAsObject.version = localCfg.packageVersion;
-            if (localCfg.commitSHA) {
-                contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
-            }
-        });
-    };
+        var fs=require("fs");
+        var pathModule=require("path");
 
-    var updateAppPackageDef = function(content, srcPath) {
-        var currentAppName = grunt.task.current.data.appName;
-        return updatePackageDef(content, function(contentAsObject) {
-            contentAsObject.version = localCfg.packageVersion;
-            contentAsObject.author = "Telerik <support@telerik.com>";
-            var specificKeywords = ["telerik", "mobile", "nativescript", "{N}", "tns", "appbuilder"];
-            if (currentAppName.indexOf("template-") == 0) {
-                var templateName = currentAppName.substring("template-".length);
-                contentAsObject.name = "tns-" + currentAppName;
-                contentAsObject.description = "Nativescript " + templateName + " project template";
-                specificKeywords.push("template");
-            }
-            else {
-                contentAsObject.name = "tns-samples-" + currentAppName;
-                contentAsObject.description = "Nativescript " + currentAppName + " sample application";
-                specificKeywords.push("sample");
-            }
-            contentAsObject.license = "BSD";
-            addKeywords(contentAsObject, specificKeywords);
-
-            if (!contentAsObject.repository) {
-                contentAsObject.repository = {};
-            }
-            if (!contentAsObject.repository.url) {
-                contentAsObject.repository.url = localCfg.mainPackageContent.repository.url;
-            }
-            if (localCfg.commitSHA) {
-                contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
-            }
-        });
-    };
-
-    var addKeywords = function(packageObject, newKeywords) {
-        if (!packageObject.keywords) {
-            packageObject.keywords = newKeywords;
-            return;
-        }
-
-        if (typeof(packageObject.keywords) == "string") {
-            packageObject.keywords = packageObject.keywords.split(" ");
-        }
-        packageObject.keywords = packageObject.keywords.concat(newKeywords);
-    };
-
-    var updateDefinitionsPackageDef = function(content, srcPath) {
-        return updatePackageDef(content, function(contentAsObject) {
-            contentAsObject.version = localCfg.packageVersion;
-            contentAsObject.name = "tns-definitions";
-            contentAsObject.description = "NativeScript Module definitions";
-            contentAsObject.license = "Apache-2.0";
-            if (localCfg.commitSHA) {
-                contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
-            }
-        });
-    };
-
-    var getCommitSha = function() {
-        if (process.env.GIT_COMMIT) {
-            return process.env.GIT_COMMIT;
-        }
-        return "";
-    };
-
-    var assignGitSHA = function(err, stdout, stderr, cb) {
-        if (!localCfg.commitSHA) {
-            localCfg.commitSHA = stdout.replace("\n", "");
-        }
-        cb();
-    };
-
-    var getPackageVersion = function() {
-        var buildVersion = process.env.PACKAGE_VERSION;
-        if (!buildVersion) {
-            return localCfg.mainPackageContent.version;
-        }
-        return localCfg.mainPackageContent.version + "-" + buildVersion;
-    };
-
-    var processAppFile = function(content, srcPath) {
-        return content;
-    };
-
-    var getSubDirs = function(dir) {
-        var allObjects = fs.readdirSync(dir);
-        var allDirs = [];
-        for (var i=0; i<allObjects.length; i++)
-        {
-            var currentObjName = allObjects[i];
-            var currentObjPath = pathModule.join(dir, currentObjName);
-            var stats = fs.statSync(currentObjPath);
-            if (stats.isDirectory())
+        var filterTypeScriptFiles = function(content, srcPath) {
+            var matchRule = /^.*@private/ig;
+            if (matchRule.test(content))
             {
-                allDirs.push({name: currentObjName, path: currentObjPath});
+                return false;
             }
+            var processed = content;
+            processed = processed.replace(/\/\/[\/\s]*@private((.|\s)*?)\/\/[\/\s]*@endprivate/gm, "");
+            return processed;
+        };
+
+        var updatePackageDef = function(content, update)
+        {
+            var contentAsObject = JSON.parse(content);
+            update(contentAsObject);
+            return JSON.stringify(contentAsObject, null, "\t");
         }
-        return allDirs;
-    }
 
-    var localCfg = {
-        srcDir: ".",
-        srcAppsDir: "./apps",
-        packageJsonFilePath: "./package.json",
-        outDir: "./bin/dist",
-        outModulesDir: "./bin/dist/modules",
-        outAppsDir: "./bin/dist/apps",
-        outTsAppsDir: "./bin/dist/ts-apps",
-        outDefinitionsDir: "./bin/dist/definitions",
+        var updateModulesPackageDef = function(content, srcPath) {
+            return updatePackageDef(content, function(contentAsObject) {
+                contentAsObject.version = localCfg.packageVersion;
+                if (localCfg.commitSHA) {
+                    contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
+                }
+            });
+        };
 
-        excludedModules: [
-            "!./ui/slide-out/**/*.*"
-        ]
-    };
+        var updateAppPackageDef = function(content, srcPath) {
+            var currentAppName = grunt.task.current.data.appName;
+            return updatePackageDef(content, function(contentAsObject) {
+                contentAsObject.version = localCfg.packageVersion;
+                contentAsObject.author = "Telerik <support@telerik.com>";
+                var specificKeywords = ["telerik", "mobile", "nativescript", "{N}", "tns", "appbuilder"];
+                if (currentAppName.indexOf("template-") == 0) {
+                    var templateName = currentAppName.substring("template-".length);
+                    contentAsObject.name = "tns-" + currentAppName;
+                    contentAsObject.description = "Nativescript " + templateName + " project template";
+                    specificKeywords.push("template");
+                }
+                else {
+                    contentAsObject.name = "tns-samples-" + currentAppName;
+                    contentAsObject.description = "Nativescript " + currentAppName + " sample application";
+                    specificKeywords.push("sample");
+                }
+                contentAsObject.license = "BSD";
+                addKeywords(contentAsObject, specificKeywords);
 
-    var nodeTestEnv = JSON.parse(JSON.stringify(process.env));
-    nodeTestEnv['NODE_PATH'] = localCfg.outModulesDir;
+                if (!contentAsObject.repository) {
+                    contentAsObject.repository = {};
+                }
+                if (!contentAsObject.repository.url) {
+                    contentAsObject.repository.url = localCfg.mainPackageContent.repository.url;
+                }
+                if (localCfg.commitSHA) {
+                    contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
+                }
+            });
+        };
 
-    localCfg.nodeTestsDir = pathModule.join(localCfg.outModulesDir, 'node-tests');
+        var addKeywords = function(packageObject, newKeywords) {
+            if (!packageObject.keywords) {
+                packageObject.keywords = newKeywords;
+                return;
+            }
+
+            if (typeof(packageObject.keywords) == "string") {
+                packageObject.keywords = packageObject.keywords.split(" ");
+            }
+            packageObject.keywords = packageObject.keywords.concat(newKeywords);
+        };
+
+        var updateDefinitionsPackageDef = function(content, srcPath) {
+            return updatePackageDef(content, function(contentAsObject) {
+                contentAsObject.version = localCfg.packageVersion;
+                contentAsObject.name = "tns-definitions";
+                contentAsObject.description = "NativeScript Module definitions";
+                contentAsObject.license = "Apache-2.0";
+                if (localCfg.commitSHA) {
+                    contentAsObject.repository.url += "/commit/" + localCfg.commitSHA;
+                }
+            });
+        };
+
+        var getCommitSha = function() {
+            if (process.env.GIT_COMMIT) {
+                return process.env.GIT_COMMIT;
+            }
+            return "";
+        };
+
+        var assignGitSHA = function(err, stdout, stderr, cb) {
+            if (!localCfg.commitSHA) {
+                localCfg.commitSHA = stdout.replace("\n", "");
+            }
+            cb();
+        };
+
+        var getPackageVersion = function() {
+            var buildVersion = process.env.PACKAGE_VERSION;
+            if (!buildVersion) {
+                return localCfg.mainPackageContent.version;
+            }
+            return localCfg.mainPackageContent.version + "-" + buildVersion;
+        };
+
+        var processAppFile = function(content, srcPath) {
+            return content;
+        };
+
+        var getSubDirs = function(dir) {
+            var allObjects = fs.readdirSync(dir);
+            var allDirs = [];
+            for (var i=0; i<allObjects.length; i++)
+            {
+                var currentObjName = allObjects[i];
+                var currentObjPath = pathModule.join(dir, currentObjName);
+                var stats = fs.statSync(currentObjPath);
+                if (stats.isDirectory())
+                {
+                    allDirs.push({name: currentObjName, path: currentObjPath});
+                }
+            }
+            return allDirs;
+        }
+
+        var localCfg = {
+            srcDir: ".",
+            srcAppsDir: "./apps",
+            packageJsonFilePath: "./package.json",
+            outDir: "./bin/dist",
+            outModulesDir: "./bin/dist/modules",
+            outAppsDir: "./bin/dist/apps",
+            outTsAppsDir: "./bin/dist/ts-apps",
+            outDefinitionsDir: "./bin/dist/definitions",
+
+            excludedModules: [
+                "!./ui/slide-out/**/*.*"
+            ]
+        };
+
+        var nodeTestEnv = JSON.parse(JSON.stringify(process.env));
+        nodeTestEnv['NODE_PATH'] = localCfg.outModulesDir;
+
+        localCfg.nodeTestsDir = pathModule.join(localCfg.outModulesDir, 'node-tests');
 
 
-    localCfg.mainPackageContent = grunt.file.readJSON(localCfg.packageJsonFilePath);
-    localCfg.packageVersion = getPackageVersion(localCfg.packageJsonFilePath);
-    localCfg.commitSHA = getCommitSha();
-    localCfg.defaultExcludes = [
+        localCfg.mainPackageContent = grunt.file.readJSON(localCfg.packageJsonFilePath);
+        localCfg.packageVersion = getPackageVersion(localCfg.packageJsonFilePath);
+        localCfg.commitSHA = getCommitSha();
+        localCfg.defaultExcludes = [
             "!" + localCfg.outDir + "/**/*.*",
             "!./node_modules/**/*.*",
             "!./bin/**/*.*",
-            "!./build/**/*.*",
-            "!./Deploy/**/*.*",
-            "!./obj/**/*.*",
-            "!./out/**/*.*",
-            "!./.*/**/*.*"
+                "!./build/**/*.*",
+                "!./Deploy/**/*.*",
+                    "!./obj/**/*.*",
+                    "!./out/**/*.*",
+                        "!./.*/**/*.*"
         ];
-    localCfg.typeScriptSrc = [
+        localCfg.typeScriptSrc = [
             "./**/*.ts"
         ].concat(localCfg.defaultExcludes).concat(localCfg.excludedModules);
-    localCfg.typeScriptSrcForTsLint = localCfg.typeScriptSrc.concat([
-        "!./ios.d.ts",
-        "!./android17.d.ts",
-        "!./libjs.d.ts"
-    ]);
+        localCfg.typeScriptSrcForTsLint = localCfg.typeScriptSrc.concat([
+                "!./ios.d.ts",
+                "!./android17.d.ts",
+                "!./libjs.d.ts"
+        ]);
 
-    grunt.initConfig({
-        localCfg : localCfg,
-        pkg: grunt.file.readJSON('package.json'),
-        clean: {
-            build: {
-                src: [localCfg.outDir]
-            },
-            typeScriptLeftovers: {
-                expand: true,
-                src: [
-                    "./.baseDir.*",
-                    "./_references.js",
-                    "./**/*.map"
-                ],
-                cwd: localCfg.outModulesDir
-            },
-            nodeTests: {
-                src: localCfg.nodeTestsDir,
-            },
-            readyAppFiles: {
-                src: [localCfg.outModulesDir + "/apps/**"]
-            }
-        },
-        copy: {
-            jsLibs: {
-                expand: true,
-                src: [
-                    "./js-libs/**/*.js",
-                    "./fetch/**/*.js",
-                    "./css/**/*.js",
-                    "./css-value/**/*.js",
-                ],
-                dest: "<%= localCfg.outModulesDir %>/",
-                cwd: localCfg.srcDir
-            },
-            license: {
-                expand: true,
-                src: [
-                    "./LICENSE",
-                ],
-                dest: "<%= localCfg.outModulesDir %>/",
-                cwd: localCfg.srcDir
-            },
-            appLicense: {
-                expand: true,
-                src: ["./LICENSE"],
-                cwd: localCfg.srcAppsDir,
-                dest: "__dummy__"
-            },
-            definitionFiles: {
-                src: [
-                    localCfg.srcDir + "/**/*.d.ts",
-                    pathModule.join(localCfg.srcDir, "LICENSE"),
-                    //Exclude the d.ts files in the apps folder - these are part of the apps and are already packed there!
-                    "!" + localCfg.srcDir + "/apps/**"
-                ].concat(localCfg.defaultExcludes).concat(localCfg.excludedModules),
-                dest: localCfg.outDefinitionsDir + "/",
-                expand: true,
-                options: {
-                    process: filterTypeScriptFiles
-                }
-            },
-            modulesPackageDef: {
-                expand: true,
-                src: localCfg.packageJsonFilePath,
-                dest: localCfg.outModulesDir + "/",
-                options: {
-                    process: updateModulesPackageDef
-                }
-            },
-            definitionsPackageDef: {
-                src: localCfg.packageJsonFilePath,
-                dest: localCfg.outDefinitionsDir + "/",
-                options: {
-                    process: updateDefinitionsPackageDef
-                }
-            },
-            appPackageDef: {
-                expand: true,
-                flatten: true,
-                src: "__app_package_json",
-                dest:  "__dummy__",
-                options: {
-                    process: updateAppPackageDef
-                }
-            },
-            childPackageFiles: {
-                expand: true,
-                src: [
-                    localCfg.srcDir + "/**/package.json",
-                    "!./package.json",
-                    "!./Deploy/**/*.*",
-                    "!./bin/**/*.*",
-                    "!./Tests/**/*.*",
-                    "!" + localCfg.outDir + "/**/*.*"
-                ].concat(localCfg.excludedModules),
-                dest: localCfg.outModulesDir + "/"
-            },
-            rawAppsFiles: {
-                expand: true,
-                src: [
-                    "**/*.*",
-                    "**/*",
-                    "!**/*.map",
-                    "!**/*.ts"
-                ],
-                dest: localCfg.outAppsDir,
-                cwd: localCfg.srcAppsDir,
-                dot: true
-            },
-            readyAppFiles: {
-                expand: true,
-                src: ["./**/*.*"],
-                dest: localCfg.outAppsDir + "/",
-                cwd: localCfg.outModulesDir + "/apps/",
-                options: {
-                    process: processAppFile
-                }
-            },
-            readyTsAppFiles: {
-                expand: true,
-                src: ["./**/*.*", "!./**/*.map"],
-                dest: localCfg.outTsAppsDir + "/",
-                cwd: localCfg.srcAppsDir
-            },
-            readyPackages: {
-                expand: true,
-                src: ["./**/*.tgz"],
-                dest: localCfg.outDir + "/",
-                cwd: localCfg.outDir,
-                flatten: true
-            }
-        },
-        ts: {
-            build: {
-                src: localCfg.typeScriptSrc,
-                outDir: localCfg.outModulesDir,
-                options: {
-                    fast: 'never',
-                    module: "commonjs",
-                    target: "es5",
-                    sourceMap: false,
-                    declaration: false,
-                    removeComments: "<%= !grunt.option('leavecomments') || '' %>",
-                    compiler: "node_modules/typescript/bin/tsc",
-                    noEmitOnError: true,
-                    experimentalDecorators: true,
-                    noEmitHelpers: true
-                }
-            },
-            buildNodeTests: {
-                src: [
-                    'js-libs/easysax/**/*.ts',
-                    'xml/**/*.ts',
-                    'node-tests/**/*.ts',
-                ],
-                outDir: localCfg.outModulesDir,
-                options: {
-                    fast: 'never',
-                    module: "commonjs",
-                    target: "es5",
-                    sourceMap: false,
-                    declaration: false,
-                    removeComments: "<%= !grunt.option('leavecomments') || '' %>",
-                    compiler: "node_modules/typescript/bin/tsc",
-                    noEmitOnError: true
-                }
-            }
-        },
-        tslint: {
-            build: {
-                files: {
-                    src: localCfg.typeScriptSrcForTsLint
+        grunt.initConfig({
+            localCfg : localCfg,
+            pkg: grunt.file.readJSON('package.json'),
+            clean: {
+                build: {
+                    src: [localCfg.outDir]
                 },
-                options: {
-                    configuration: grunt.file.readJSON("./build/tslint.json")
-                }
-            }
-        },
-        exec: {
-            packModules: {
-                cmd: "npm pack",
-                cwd: localCfg.outModulesDir + "/"
-            },
-            packDefinitions: {
-                cmd: "npm pack",
-                cwd: localCfg.outDefinitionsDir + "/"
-            },
-            packApp: {
-                cmd: "npm pack",
-                cwd: "__dummy__"
-            },
-            mochaNode: {
-                cmd: "grunt simplemocha:node"
-            },
-            runTestsApp: {
-                cmd: "./runtestsapp.sh"
-            }
-        },
-        multidest: {
-            copyLicenseFiles: {
-                tasks: ["copy:appLicense"],
-                dest: function() {
-                    var apps = getSubDirs(localCfg.srcAppsDir);
-                    var targetDirs = [];
-                    apps.forEach(function(item){
-                        targetDirs.push(pathModule.join(localCfg.outAppsDir, item.name));
-                        targetDirs.push(pathModule.join(localCfg.outTsAppsDir, item.name));
-                    });
-                    return targetDirs;
-                }()
-            }
-        },
-        shell: {
-            getGitSHA: {
-                command: "git rev-parse HEAD",
-                options: {
-                    callback: assignGitSHA
+                typeScriptLeftovers: {
+                    expand: true,
+                    src: [
+                        "./.baseDir.*",
+                        "./_references.js",
+                        "./**/*.map"
+                    ],
+                    cwd: localCfg.outModulesDir
+                },
+                nodeTests: {
+                    src: localCfg.nodeTestsDir,
+                },
+                readyAppFiles: {
+                    src: [localCfg.outModulesDir + "/apps/**"]
                 }
             },
-        },
-        simplemocha: {
-            node: {
-                src: localCfg.nodeTestsDir + '/**/*.js'
-            }
-        },
-        env: {
-            nodeTests: {
-                NODE_PATH: localCfg.outModulesDir,
-            }
-        }
-    });
+            copy: {
+                jsLibs: {
+                    expand: true,
+                    src: [
+                        "./js-libs/**/*.js",
+                        "./fetch/**/*.js",
+                        "./css/**/*.js",
+                            "./css-value/**/*.js",
+                    ],
+                    dest: "<%= localCfg.outModulesDir %>/",
+                    cwd: localCfg.srcDir
+                },
+                license: {
+                    expand: true,
+                    src: [
+                        "./LICENSE",
+                    ],
+                    dest: "<%= localCfg.outModulesDir %>/",
+                    cwd: localCfg.srcDir
+                },
+                appLicense: {
+                    expand: true,
+                    src: ["./LICENSE"],
+                    cwd: localCfg.srcAppsDir,
+                    dest: "__dummy__"
+                },
+                definitionFiles: {
+                    src: [
+                        localCfg.srcDir + "/**/*.d.ts",
+                        pathModule.join(localCfg.srcDir, "LICENSE"),
+                        //Exclude the d.ts files in the apps folder - these are part of the apps and are already packed there!
+                        "!" + localCfg.srcDir + "/apps/**"
+                    ].concat(localCfg.defaultExcludes).concat(localCfg.excludedModules),
+                    dest: localCfg.outDefinitionsDir + "/",
+                    expand: true,
+                    options: {
+                        process: filterTypeScriptFiles
+                    }
+                },
+                modulesPackageDef: {
+                    expand: true,
+                    src: localCfg.packageJsonFilePath,
+                    dest: localCfg.outModulesDir + "/",
+                    options: {
+                        process: updateModulesPackageDef
+                    }
+                },
+                definitionsPackageDef: {
+                    src: localCfg.packageJsonFilePath,
+                    dest: localCfg.outDefinitionsDir + "/",
+                    options: {
+                        process: updateDefinitionsPackageDef
+                    }
+                },
+                appPackageDef: {
+                    expand: true,
+                    flatten: true,
+                    src: "__app_package_json",
+                    dest:  "__dummy__",
+                    options: {
+                        process: updateAppPackageDef
+                    }
+                },
+                childPackageFiles: {
+                    expand: true,
+                    src: [
+                        localCfg.srcDir + "/**/package.json",
+                        "!./package.json",
+                        "!./Deploy/**/*.*",
+                            "!./bin/**/*.*",
+                            "!./Tests/**/*.*",
+                                "!" + localCfg.outDir + "/**/*.*"
+                    ].concat(localCfg.excludedModules),
+                    dest: localCfg.outModulesDir + "/"
+                },
+                rawAppsFiles: {
+                    expand: true,
+                    src: [
+                        "**/*.*",
+                        "**/*",
+                        "!**/*.map",
+                            "!**/*.ts"
+                    ],
+                    dest: localCfg.outAppsDir,
+                    cwd: localCfg.srcAppsDir,
+                    dot: true
+                },
+                readyAppFiles: {
+                    expand: true,
+                    src: ["./**/*.*"],
+                    dest: localCfg.outAppsDir + "/",
+                    cwd: localCfg.outModulesDir + "/apps/",
+                    options: {
+                        process: processAppFile
+                    }
+                },
+                readyTsAppFiles: {
+                    expand: true,
+                    src: ["./**/*.*", "!./**/*.map"],
+                    dest: localCfg.outTsAppsDir + "/",
+                    cwd: localCfg.srcAppsDir
+                },
+                readyPackages: {
+                    expand: true,
+                    src: ["./**/*.tgz"],
+                    dest: localCfg.outDir + "/",
+                    cwd: localCfg.outDir,
+                    flatten: true
+                }
+            },
+            ts: {
+                build: {
+                    src: localCfg.typeScriptSrc,
+                    outDir: localCfg.outModulesDir,
+                    options: {
+                        fast: 'never',
+                        module: "commonjs",
+                        target: "es5",
+                        sourceMap: false,
+                        declaration: false,
+                        removeComments: "<%= !grunt.option('leavecomments') || '' %>",
+                        compiler: "node_modules/typescript/bin/tsc",
+                        noEmitOnError: true,
+                        experimentalDecorators: true,
+                        noEmitHelpers: true
+                    }
+                },
+                buildNodeTests: {
+                    src: [
+                        'js-libs/easysax/**/*.ts',
+                                             'xml/**/*.ts',
+                                                      'node-tests/**/*.ts',
+                                                                      ],
+                                                                      outDir: localCfg.outModulesDir,
+                                                                      options: {
+                                                                      fast: 'never',
+                                                                      module: "commonjs",
+                                                                      target: "es5",
+                                                                      sourceMap: false,
+                                                                      declaration: false,
+                                                                      removeComments: "<%= !grunt.option('leavecomments') || '' %>",
+                                                                      compiler: "node_modules/typescript/bin/tsc",
+                                                                      noEmitOnError: true
+                                                                      }
+                                                                      }
+                                                                      },
+                                                                      tslint: {
+                                                                      build: {
+                                                                      files: {
+                                                                      src: localCfg.typeScriptSrcForTsLint
+                                                                      },
+                                                                      options: {
+                                                                      configuration: grunt.file.readJSON("./build/tslint.json")
+                                                                      }
+                                                                      }
+                                                                      },
+                                                                      exec: {
+                                                                      packModules: {
+                                                                      cmd: "npm pack",
+                                                                      cwd: localCfg.outModulesDir + "/"
+                                                                      },
+                                                                      packDefinitions: {
+                                                                      cmd: "npm pack",
+                                                                      cwd: localCfg.outDefinitionsDir + "/"
+                                                                      },
+                                                                      packApp: {
+                                                                      cmd: "npm pack",
+                                                                      cwd: "__dummy__"
+                                                                      },
+                                                                      mochaNode: {
+                                                                      cmd: "grunt simplemocha:node"
+                                                                      }
+                                                                      },
+                                                                      multidest: {
+                                                                      copyLicenseFiles: {
+                                                                      tasks: ["copy:appLicense"],
+                                                                      dest: function() {
+                                                                      var apps = getSubDirs(localCfg.srcAppsDir);
+                                                                      var targetDirs = [];
+                                                                      apps.forEach(function(item){
+                                                                      targetDirs.push(pathModule.join(localCfg.outAppsDir, item.name));
+                                                                      targetDirs.push(pathModule.join(localCfg.outTsAppsDir, item.name));
+                                                                      });
+                                                                      return targetDirs;
+                                                                      }()
+                                                                      }
+                                                                      },
+                                                                      shell: {
+                                                                      getGitSHA: {
+                                                                      command: "git rev-parse HEAD",
+                                                                      options: {
+                                                                      callback: assignGitSHA
+                                                                      }
+                                                                      },
+                                                                      },
+                                                                      simplemocha: {
+                                                                      node: {
+                                                                      src: localCfg.nodeTestsDir + '/**/*.js'
+                                                                                                         }
+                                                                                                         },
+                                                                                                         env: {
+                                                                                                         nodeTests: {
+                                                                                                         NODE_PATH: localCfg.outModulesDir,
+                                                                                                         }
+                                                                                                         }
+                                                                                                         });
 
-    grunt.loadNpmTasks("grunt-ts");
-    grunt.loadNpmTasks("grunt-contrib-clean");
-    grunt.loadNpmTasks("grunt-contrib-copy");
-    grunt.loadNpmTasks("grunt-exec");
-    grunt.loadNpmTasks("grunt-tslint");
-    grunt.loadNpmTasks("grunt-multi-dest");
-    grunt.loadNpmTasks("grunt-shell");
-    grunt.loadNpmTasks("grunt-env");
-    grunt.loadNpmTasks("grunt-simple-mocha");
+                                                                                                         grunt.loadNpmTasks("grunt-ts");
+                                                                                                         grunt.loadNpmTasks("grunt-contrib-clean");
+                                                                                                         grunt.loadNpmTasks("grunt-contrib-copy");
+                                                                                                         grunt.loadNpmTasks("grunt-exec");
+                                                                                                         grunt.loadNpmTasks("grunt-tslint");
+                                                                                                         grunt.loadNpmTasks("grunt-multi-dest");
+                                                                                                         grunt.loadNpmTasks("grunt-shell");
+                                                                                                         grunt.loadNpmTasks("grunt-env");
+                                                                                                         grunt.loadNpmTasks("grunt-simple-mocha");
 
-    var cloneTasks = function(originalTasks, taskNameSuffix)
-    {
-        var clonedTasks = [];
-        for(var i=0; i<originalTasks.length; i++)
-        {
-            var originalTask = originalTasks[i];
+                                                                                                         var cloneTasks = function(originalTasks, taskNameSuffix)
+                                                                                                         {
+                                                                                                         var clonedTasks = [];
+                                                                                                         for(var i=0; i<originalTasks.length; i++)
+                                                                                                         {
+                                                                                                         var originalTask = originalTasks[i];
 
-            var taskCfg = grunt.util._.clone(grunt.config(originalTask.name));
-            var taskName = grunt.util._.clone(originalTask.name);
-            taskName[1] = taskName[1] + "_" + taskNameSuffix;
+                                                                                                         var taskCfg = grunt.util._.clone(grunt.config(originalTask.name));
+                                                                                                         var taskName = grunt.util._.clone(originalTask.name);
+                                                                                                         taskName[1] = taskName[1] + "_" + taskNameSuffix;
 
-            originalTask.specializeCfg(taskCfg, taskNameSuffix);
+                                                                                                         originalTask.specializeCfg(taskCfg, taskNameSuffix);
+
+                                                                                                         clonedTasks.push({name: taskName, cfg: taskCfg});
+                                                                                                         }
+                                                                                                         return clonedTasks;
+                                                                                                         }
+
+                                                                                                         var enqueueTasks = function(tasks) {
+                                                                                                         for (var i=0; i<tasks.length; i++) {
+                                                                                                         var task = tasks[i];
+                                                                                                         grunt.config(task.name, task.cfg);
+                                                                                                         grunt.task.run(task.name.join(":"));
+                                                                                                         }
+                                                                                                         }
+
+                                                                                                         grunt.registerTask("processEachApp", function(outAppsDir, pkgAppNameSuffix){
+                                                                                                         var allapps = getSubDirs(localCfg.srcAppsDir);
+                                                                                                         var tasks = [
+                                                                                                         {
+                                                                                                         name: ["copy", "appPackageDef"],
+                                                                                                         specializeCfg: function (cfg, currentAppName) {
+                                                                                                         outAppDir = pathModule.join(outAppsDir, currentAppName);
+                                                                                                         var pkgFilePath = pathModule.join(outAppDir, "package.json");
+                                                                                                         cfg.src = pkgFilePath;
+                                                                                                         cfg.dest = outAppDir;
+                                                                                                         cfg.appName = currentApp.name + (pkgAppNameSuffix || "");
+                                                                                                         }
+                                                                                                         },
+                                                                                                         {
+                                                                                                         name: ["exec", "packApp"],
+                                                                                                         specializeCfg: function(cfg, currentAppName) {
+                                                                                                         cfg.cwd = pathModule.join(outAppsDir, currentAppName);
+                                                                                                         }
+                                                                                                         }
+                                                                                                         ];
+
+                                                                                                         for (var j=0; j<allapps.length; j++)
+                                                                                                         {
+                                                                                                         var currentApp = allapps[j];
+                                                                                                         var clonedTasks = cloneTasks(tasks, currentApp.name);
+
+                        enqueueTasks(clonedTasks);
+                }
+                });
+
+        grunt.registerTask("tests", [
+                "default"
+        ]);
+
+        grunt.registerTask("collect-apps-raw-files", [
+                "copy:rawAppsFiles",
+                "multidest:copyLicenseFiles"
+        ]);
+
+        // Does nothing to avoid copying the same files twice. Instead,
+        //  the distribute-definition-files tasks copies the d.ts files
+        //  from the source root directly to the output folder.
+        grunt.registerTask("collect-definitions-raw-files", []);
+
+        grunt.registerTask("collect-modules-raw-files", [
+                "copy:jsLibs",
+                "copy:license"
+        ]);
+
+        grunt.registerTask("compile-ts", [
+                "ts:build",
+                "clean:typeScriptLeftovers",
+                "copy:childPackageFiles"
+        ]);
+        grunt.registerTask("distribute-apps-files", [
+                "copy:readyAppFiles",
+                "clean:readyAppFiles"
+        ]);
+        grunt.registerTask("distribute-ts-apps-files", [
+                "copy:readyTsAppFiles"
+        ]);
+        grunt.registerTask("distribute-definition-files", [
+                "copy:definitionFiles"
+        ]);
+        grunt.registerTask("pack-modules", [
+                "copy:modulesPackageDef",
+                "exec:packModules"
+        ]);
+        grunt.registerTask("pack-apps", [
+                "processEachApp:" + localCfg.outAppsDir
+        ]);
+        grunt.registerTask("pack-ts-apps", [
+                "processEachApp:" + localCfg.outTsAppsDir + ":-ts"
+        ]);
+        grunt.registerTask("pack-definitions", [
+                "copy:definitionsPackageDef",
+                "exec:packDefinitions"
+        ]);
+        grunt.registerTask("get-ready-packages", [
+                "copy:readyPackages"
+        ]);
+
+        grunt.registerTask("default", ((typeof(grunt.option('runtslint')) != "undefined" && !grunt.option('runtslint')) ? [] : ["tslint:build"]).concat([
+                    "just-build",
+
+                    "pack-apps",
+                    "pack-ts-apps",
+                    "pack-definitions",
+                    "get-ready-packages"
+        ]));
+
+        grunt.registerTask("just-build", ((typeof(grunt.option('runtslint')) != "undefined" && !grunt.option('runtslint')) ? [] : ["tslint:build"]).concat([
+                    "clean:build",
+                    "shell:getGitSHA",
+
+                    "collect-apps-raw-files",
+                    "collect-definitions-raw-files",
+                    "collect-modules-raw-files",
+
+                    "compile-ts",
+                    "distribute-apps-files",
+                    "distribute-ts-apps-files",
+                    "distribute-definition-files",
+
+                    "pack-modules"
+        ]));	
+
+        grunt.registerTask("testEnv", function() {
+            console.log('fafla', process.env.NODE_PATH);
+            //var x = require('xml')
+            //console.log(x);
+        });
+
+        grunt.registerTask("node-tests", [
+                "clean:nodeTests",
+                "ts:buildNodeTests",
+                "copy:childPackageFiles",
+                "copy:jsLibs",
+                "env:nodeTests",
+                "exec:mochaNode", //spawn a new process to use the new NODE_PATH
+        ]);
 
-            clonedTasks.push({name: taskName, cfg: taskCfg});
-        }
-        return clonedTasks;
     }
 
-    var enqueueTasks = function(tasks) {
-        for (var i=0; i<tasks.length; i++) {
-            var task = tasks[i];
-            grunt.config(task.name, task.cfg);
-            grunt.task.run(task.name.join(":"));
-        }
-    }
-
-    grunt.registerTask("processEachApp", function(outAppsDir, pkgAppNameSuffix){
-        var allapps = getSubDirs(localCfg.srcAppsDir);
-        var tasks = [
-            {
-                name: ["copy", "appPackageDef"],
-                specializeCfg: function (cfg, currentAppName) {
-                    outAppDir = pathModule.join(outAppsDir, currentAppName);
-                    var pkgFilePath = pathModule.join(outAppDir, "package.json");
-                    cfg.src = pkgFilePath;
-                    cfg.dest = outAppDir;
-                    cfg.appName = currentApp.name + (pkgAppNameSuffix || "");
-                }
-            },
-            {
-                name: ["exec", "packApp"],
-                specializeCfg: function(cfg, currentAppName) {
-                    cfg.cwd = pathModule.join(outAppsDir, currentAppName);
-                }
-            }
-        ];
-
-        for (var j=0; j<allapps.length; j++)
-        {
-            var currentApp = allapps[j];
-            var clonedTasks = cloneTasks(tasks, currentApp.name);
-
-            enqueueTasks(clonedTasks);
-        }
-    });
-
-    grunt.registerTask("tests", [
-        "default"
-    ]);
-
-    grunt.registerTask("collect-apps-raw-files", [
-        "copy:rawAppsFiles",
-        "multidest:copyLicenseFiles"
-    ]);
-
-    // Does nothing to avoid copying the same files twice. Instead,
-    //  the distribute-definition-files tasks copies the d.ts files
-    //  from the source root directly to the output folder.
-    grunt.registerTask("collect-definitions-raw-files", []);
-
-    grunt.registerTask("collect-modules-raw-files", [
-        "copy:jsLibs",
-        "copy:license"
-    ]);
-
-    grunt.registerTask("compile-ts", [
-        "ts:build",
-        "clean:typeScriptLeftovers",
-        "copy:childPackageFiles"
-    ]);
-    grunt.registerTask("distribute-apps-files", [
-        "copy:readyAppFiles",
-        "clean:readyAppFiles"
-    ]);
-    grunt.registerTask("distribute-ts-apps-files", [
-        "copy:readyTsAppFiles"
-    ]);
-    grunt.registerTask("distribute-definition-files", [
-        "copy:definitionFiles"
-    ]);
-    grunt.registerTask("pack-modules", [
-        "copy:modulesPackageDef",
-        "exec:packModules"
-    ]);
-    grunt.registerTask("pack-apps", [
-        "processEachApp:" + localCfg.outAppsDir
-    ]);
-    grunt.registerTask("pack-ts-apps", [
-        "processEachApp:" + localCfg.outTsAppsDir + ":-ts"
-    ]);
-    grunt.registerTask("pack-definitions", [
-        "copy:definitionsPackageDef",
-        "exec:packDefinitions"
-    ]);
-    grunt.registerTask("get-ready-packages", [
-        "copy:readyPackages"
-    ]);
-
-    grunt.registerTask("default", ((typeof(grunt.option('runtslint')) != "undefined" && !grunt.option('runtslint')) ? [] : ["tslint:build"]).concat([
-        "just-build",
-		
-        "pack-apps",
-        "pack-ts-apps",
-        "pack-definitions",
-        "get-ready-packages"
-    ]));
-	
-    grunt.registerTask("just-build", ((typeof(grunt.option('runtslint')) != "undefined" && !grunt.option('runtslint')) ? [] : ["tslint:build"]).concat([
-        "clean:build",
-        "shell:getGitSHA",
-
-        "collect-apps-raw-files",
-        "collect-definitions-raw-files",
-        "collect-modules-raw-files",
-
-        "compile-ts",
-        "distribute-apps-files",
-        "distribute-ts-apps-files",
-        "distribute-definition-files",
-
-        "pack-modules"
-    ]));	
-
-    grunt.registerTask("testEnv", function() {
-        console.log('fafla', process.env.NODE_PATH);
-        //var x = require('xml')
-        //console.log(x);
-    });
-
-    grunt.registerTask("node-tests", [
-        "clean:nodeTests",
-        "ts:buildNodeTests",
-        "copy:childPackageFiles",
-        "copy:jsLibs",
-        "env:nodeTests",
-        "exec:mochaNode", //spawn a new process to use the new NODE_PATH
-    ]);
-
-    grunt.registerTask("testsapp", [
-        "exec:runTestsApp"
-    ]);
 };
diff --git a/package.json b/package.json
index c777a4799..487c4a0a3 100644
--- a/package.json
+++ b/package.json
@@ -13,18 +13,19 @@
   ],
   "license": "Apache-2.0",
   "devDependencies": {
+    "chai": "3.2.0",
     "grunt": "0.4.5",
     "grunt-contrib-clean": "0.6.0",
     "grunt-contrib-copy": "git+https://github.com/ErjanGavalji/grunt-contrib-copy.git#1c976a133210be4ce8c96313f5daf14833f7f8f9",
+    "grunt-env": "0.4.4",
     "grunt-exec": "0.4.6",
+    "grunt-mkdir": "^0.1.2",
     "grunt-multi-dest": "1.0.0",
     "grunt-shell": "1.1.2",
+    "grunt-simple-mocha": "0.4.0",
     "grunt-ts": "5.0.0-beta.5",
     "grunt-tslint": "2.5.0",
     "mocha": "2.2.5",
-    "grunt-simple-mocha": "0.4.0",
-    "grunt-env": "0.4.4",
-    "chai": "3.2.0",
     "typescript": "1.6.2"
   }
 }
diff --git a/runtestsapp.sh b/runtestsapp.sh
index ee3af583b..425f24007 100755
--- a/runtestsapp.sh
+++ b/runtestsapp.sh
@@ -11,17 +11,9 @@ pathToApk=./platforms/android/build/outputs/apk/$testsAppName-debug.apk
 deployedAppName=org.nativescript.$testsAppName
 mainActivityName=com.tns.NativeScriptActivity
 
-rm -rd $workingdir
-mkdir $workingdir
-cd $workingdir
-
 # Creating the emulator with:
 #android create avd -t "android-21" -n Api21 -b "default/x86"
 
-echo "------------------------------------------------"
-echo "Killing the emulator..."
-time pkill $emuProcId && true
-
 echo "------------------------------------------------"
 echo "Starting the emulator..."
 time emulator -avd $emuAvdName -no-audio -no-window &
@@ -79,6 +71,4 @@ echo "------------------------------------------------"
 echo "Waiting for the tests to finish executing..."
 time ./expect.exp $outfile
 
-pkill $emuProcId && true
-
 rm -rd $workingdir