diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json
index 04627d55a2..670b3b68eb 100644
--- a/ng2-components/ng2-alfresco-documentlist/package.json
+++ b/ng2-components/ng2-alfresco-documentlist/package.json
@@ -12,8 +12,7 @@
         "tsc": "tsc",
         "tsc:w": "tsc -w",
         "typings": "typings",
-        "test": "live-server --open=index.html --entry-file=test/ --mount=/ng2-alfresco-core:../ng2-alfresco-core",
-        "test:w": "concurrently \"npm run tsc:w\" \"npm run test\" "
+        "test": "karma start karma.conf.js"
     },
     "repository": {
         "type": "git",
@@ -27,6 +26,9 @@
         {
             "name": "Denys Vuika",
             "email": "denis.vuyka@gmail.com"
+        },{
+            "name": "Mario Romano",
+            "email": "mario.romano83@gmail.com"
         }
     ],
     "keywords": [
@@ -41,7 +43,8 @@
         "es6-shim": "^0.35.0",
         "reflect-metadata": "0.1.2",
         "rxjs": "5.0.0-beta.2",
-        "zone.js": "0.6.10"
+        "zone.js": "^0.6.12",
+        "es6-module-loader": "^0.17.8"
     },
     "peerDependencies": {
         "angular2": "2.0.0-beta.15"
@@ -54,7 +57,18 @@
         "live-server": "^0.9.2",
         "concurrently": "^2.0.0",
         "license-check": "^1.0.4",
-        "tslint": "^3.8.1"
+        "tslint": "^3.8.1",
+        "jasmine-spec-reporter": "^2.4.0",
+        "karma": "~0.13.22",
+        "karma-chrome-launcher": "~1.0.1",
+        "karma-coverage": "^1.0.0",
+        "karma-ie-launcher": "^1.0.0",
+        "karma-jasmine": "~1.0.2",
+        "karma-mocha-reporter": "^2.0.3",
+        "karma-phantomjs-launcher": "^1.0.0",
+        "traceur": "^0.0.91",
+        "remap-istanbul": "^0.6.3",
+        "phantomjs-prebuilt": "^2.1.7"
     },
     "license-check-config": {
         "src": [
@@ -63,7 +77,8 @@
             "!/**/coverage/**/*",
             "!/**/demo/**/*",
             "!/**/node_modules/**/*",
-            "!/**/typings/**/*"
+            "!/**/typings/**/*",
+            "!*.js"
         ],
         "path": "assets/license_header.txt",
         "blocking": false,
diff --git a/ng2-components/ng2-alfresco-documentlist/test/assets/alfresco.service.mock.ts b/ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-documentlist/test/assets/alfresco.service.mock.ts
rename to ng2-components/ng2-alfresco-documentlist/src/assets/alfresco.service.mock.ts
diff --git a/ng2-components/ng2-alfresco-documentlist/test/components/content-action.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-action.spec.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-documentlist/test/components/content-action.spec.ts
rename to ng2-components/ng2-alfresco-documentlist/src/components/content-action.spec.ts
diff --git a/ng2-components/ng2-alfresco-documentlist/test/components/content-column-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.spec.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-documentlist/test/components/content-column-list.spec.ts
rename to ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.spec.ts
diff --git a/ng2-components/ng2-alfresco-documentlist/test/components/content-column.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column.spec.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-documentlist/test/components/content-column.spec.ts
rename to ng2-components/ng2-alfresco-documentlist/src/components/content-column.spec.ts
diff --git a/ng2-components/ng2-alfresco-documentlist/test/components/document-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-documentlist/test/components/document-list.spec.ts
rename to ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts
diff --git a/ng2-components/ng2-alfresco-documentlist/test/services/document-actions.service.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-documentlist/test/services/document-actions.service.spec.ts
rename to ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts
diff --git a/ng2-components/ng2-alfresco-documentlist/test/services/folder-actions.service.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/services/folder-actions.service.spec.ts
similarity index 100%
rename from ng2-components/ng2-alfresco-documentlist/test/services/folder-actions.service.spec.ts
rename to ng2-components/ng2-alfresco-documentlist/src/services/folder-actions.service.spec.ts
diff --git a/ng2-components/ng2-alfresco-documentlist/test/.gitignore b/ng2-components/ng2-alfresco-documentlist/test/.gitignore
deleted file mode 100644
index 75871e6dc2..0000000000
--- a/ng2-components/ng2-alfresco-documentlist/test/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.js
-*.js.map
-*.d.ts
diff --git a/ng2-components/ng2-alfresco-documentlist/test/index.html b/ng2-components/ng2-alfresco-documentlist/test/index.html
deleted file mode 100644
index bb9b2155b3..0000000000
--- a/ng2-components/ng2-alfresco-documentlist/test/index.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <base href="/">
-    <meta http-equiv="content-type" content="text/html;charset=utf-8">
-    <title>Document List Tests</title>
-    <link rel="stylesheet" href="../node_modules/jasmine-core/lib/jasmine-core/jasmine.css">
-    <script src="../node_modules/jasmine-core/lib/jasmine-core/jasmine.js"></script>
-    <script src="../node_modules/jasmine-core/lib/jasmine-core/jasmine-html.js"></script>
-    <script src="../node_modules/jasmine-core/lib/jasmine-core/boot.js"></script>
-</head>
-<body>
-    <!-- 1. Load libraries -->
-    <!-- IE required polyfills, in this exact order -->
-    <script src="../node_modules/es6-shim/es6-shim.min.js"></script>
-    <script src="../node_modules/systemjs/dist/system-polyfills.js"></script>
-    <script src="../node_modules/angular2/es6/dev/src/testing/shims_for_IE.js"></script>
-    <script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
-    <script src="../node_modules/systemjs/dist/system.src.js"></script>
-    <script src="../node_modules/rxjs/bundles/Rx.js"></script>
-    <script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
-
-    <script src="../node_modules/angular2/bundles/http.dev.js"></script>
-    <script src="../node_modules/angular2/bundles/router.dev.js"></script>
-    <script src="../node_modules/angular2/bundles/testing.dev.js"></script>
-
-    <script>
-        // #2. Configure systemjs to use the .js extension
-        //     for imports from the app folder
-        System.config({
-            packages: {
-                'test': {defaultExtension: 'js'},
-                'src': {defaultExtension: 'js'},
-                'ng2-alfresco-core': {defaultExtension: 'js'}
-            }
-        });
-
-        // #3. Import the spec file explicitly
-        Promise.all([
-            System.import('test/components/content-action.spec'),
-            System.import('test/components/document-list.spec'),
-            System.import('test/components/content-column-list.spec'),
-            System.import('test/components/content-column.spec'),
-            System.import('test/services/folder-actions.service.spec'),
-            System.import('test/services/document-actions.service.spec')
-        ])
-        // #4. wait for all imports to load ...
-        //     then re-execute `window.onload` which
-        //     triggers the Jasmine test-runner start
-        //     or explain what went wrong.
-        .then(window.onload)
-        .catch(console.error.bind(console));
-    </script>
-
-</body>
-</html>
diff --git a/ng2-components/ng2-alfresco-documentlist/test/tsconfig.json b/ng2-components/ng2-alfresco-documentlist/test/tsconfig.json
deleted file mode 100644
index 6d6c8be320..0000000000
--- a/ng2-components/ng2-alfresco-documentlist/test/tsconfig.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "es5",
-        "module": "system",
-        "moduleResolution": "node",
-        "sourceMap": true,
-        "emitDecoratorMetadata": true,
-        "experimentalDecorators": true,
-        "removeComments": false,
-        "noImplicitAny": false,
-        "declaration": false,
-        "outDir": "../dist"
-    },
-    "files": [
-        "../node_modules/angular2/typings/browser.d.ts",
-        "../typings/main/ambient/jasmine/index.d.ts",
-        "assets/alfresco.service.mock.ts",
-        "components/content-action.spec.ts",
-        "components/document-list.spec.ts",
-        "components/content-column-list.spec.ts",
-        "components/content-column.spec.ts",
-        "services/folder-actions.service.spec.ts",
-        "services/document-actions.service.spec.ts"
-    ],
-    "exclude": [
-    ]
-}
diff --git a/ng2-components/ng2-alfresco-documentlist/tsconfig.json b/ng2-components/ng2-alfresco-documentlist/tsconfig.json
index 0f207ad885..05edabdb2d 100644
--- a/ng2-components/ng2-alfresco-documentlist/tsconfig.json
+++ b/ng2-components/ng2-alfresco-documentlist/tsconfig.json
@@ -1,23 +1,27 @@
 {
-  "compilerOptions": {
-    "target": "es5",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "sourceMap": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "removeComments": false,
-    "noImplicitAny": false,
-    "declaration": true,
-    "outDir": "dist"
-  },
-  "exclude": [
-    "node_modules",
-    "dist",
-    "typings/browser.d.ts",
-    "typings/browser",
-    "demo",
-    "src"
-  ],
-  "compileOnSave": false
+    "compilerOptions": {
+        "target": "es5",
+        "module": "commonjs",
+        "declaration": false,
+        "removeComments": true,
+        "noLib": false,
+        "emitDecoratorMetadata": true,
+        "experimentalDecorators": true,
+        "sourceMap": true,
+        "allowUnreachableCode": false,
+        "allowUnusedLabels": false,
+        "noImplicitAny": false,
+        "noImplicitReturns": false,
+        "noImplicitUseStrict": false,
+        "noFallthroughCasesInSwitch": true,
+        "outDir": "dist"
+    },
+    "exclude": [
+        "node_modules",
+        "dist",
+        "typings/browser.d.ts",
+        "typings/browser",
+        "demo"
+    ],
+    "compileOnSave": false
 }
diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json
index 00c7cfb032..bf61e63599 100644
--- a/ng2-components/ng2-alfresco-login/package.json
+++ b/ng2-components/ng2-alfresco-login/package.json
@@ -30,6 +30,10 @@
         {
             "name": "Maurizio Vitale",
             "email": "maurizio.vitale84@gmail.com"
+        },
+        {
+            "name": "Mario Romano",
+            "email": "mario.romano83@gmail.com"
         }
     ],
     "keywords": [
@@ -79,7 +83,8 @@
             "!/**/coverage/**/*",
             "!/**/demo/**/*",
             "!/**/node_modules/**/*",
-            "!/**/typings/**/*"
+            "!/**/typings/**/*",
+            "!*.js"
         ],
         "path": "assets/license_header.txt",
         "blocking": false,