diff --git a/demo-shell-ng2/app/app.module.ts b/demo-shell-ng2/app/app.module.ts
index 1051186d22..665b9c652e 100644
--- a/demo-shell-ng2/app/app.module.ts
+++ b/demo-shell-ng2/app/app.module.ts
@@ -30,13 +30,13 @@ import { UploadModule } from 'ng2-alfresco-upload';
 import { TagModule } from 'ng2-alfresco-tag';
 import { WebScriptModule } from 'ng2-alfresco-webscript';
 import { ViewerModule } from 'ng2-alfresco-viewer';
+import { ActivitiFormModule } from 'ng2-activiti-form';
 
 import { AppComponent } from './app.component';
 import { routing } from './app.routes';
 
 import { ALFRESCO_TASKLIST_DIRECTIVES } from 'ng2-activiti-tasklist';
 import { ACTIVITI_PROCESSLIST_DIRECTIVES } from 'ng2-activiti-processlist';
-import { ActivitiForm, ATIVITI_FORM_PROVIDERS } from 'ng2-activiti-form';
 
 import { AlfrescoTranslationLoader } from 'ng2-alfresco-core';
 import { Http } from '@angular/http';
@@ -55,46 +55,6 @@ import {
     FormNodeViewer
 } from './components/index';
 
-import {
-    TabsWidget, ContainerWidget,
-    TextWidget,
-    NumberWidget,
-    CheckboxWidget,
-    MultilineTextWidget,
-    DropdownWidget,
-    HyperlinkWidget,
-    RadioButtonsWidget,
-    DisplayValueWidget,
-    DisplayTextWidget,
-    UploadWidget,
-    AttachWidget,
-    TypeaheadWidget,
-    FunctionalGroupWidget,
-    PeopleWidget
-} from 'ng2-activiti-form';
-
-// todo: temp
-const ACTIVITI_FORM_DIRECTIVES: any[] = [
-    ActivitiForm,
-
-    TabsWidget,
-    ContainerWidget,
-    TextWidget,
-    NumberWidget,
-    CheckboxWidget,
-    MultilineTextWidget,
-    DropdownWidget,
-    HyperlinkWidget,
-    RadioButtonsWidget,
-    DisplayValueWidget,
-    DisplayTextWidget,
-    UploadWidget,
-    AttachWidget,
-    TypeaheadWidget,
-    FunctionalGroupWidget,
-    PeopleWidget
-];
-
 @NgModule({
     imports: [
         BrowserModule,
@@ -115,14 +75,14 @@ const ACTIVITI_FORM_DIRECTIVES: any[] = [
         UploadModule.forRoot(),
         TagModule.forRoot(),
         WebScriptModule,
-        ViewerModule.forRoot()
+        ViewerModule.forRoot(),
+        ActivitiFormModule.forRoot()
     ],
     declarations: [
         AppComponent,
         SearchBarComponent,
         ...ALFRESCO_TASKLIST_DIRECTIVES,
         ...ACTIVITI_PROCESSLIST_DIRECTIVES,
-        ...ACTIVITI_FORM_DIRECTIVES,
 
         DataTableDemoComponent,
         SearchComponent,
@@ -136,9 +96,7 @@ const ACTIVITI_FORM_DIRECTIVES: any[] = [
         FilesComponent,
         FormNodeViewer
     ],
-    providers: [
-        ...ATIVITI_FORM_PROVIDERS
-    ],
+    providers: [],
     bootstrap: [ AppComponent ]
 })
 export class AppModule { }
diff --git a/ng2-components/ng2-activiti-form/index.ts b/ng2-components/ng2-activiti-form/index.ts
index 093ae1f90c..03130f6cb4 100644
--- a/ng2-components/ng2-activiti-form/index.ts
+++ b/ng2-components/ng2-activiti-form/index.ts
@@ -15,9 +15,21 @@
  * limitations under the License.
  */
 
+import { NgModule, ModuleWithProviders } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { HttpModule } from '@angular/http';
+import { CommonModule } from '@angular/common';
+import { TranslateModule } from 'ng2-translate/ng2-translate';
+import { CoreModule } from 'ng2-alfresco-core';
+
+import { ActivitiForm } from './src/components/activiti-form.component';
 import { FormService } from './src/services/form.service';
 import { EcmModelService } from './src/services/ecm-model.service';
 import { NodeService } from './src/services/node.service';
+import { WidgetVisibilityService } from './src/services/widget-visibility.service';
+import { ActivitiAlfrescoContentService } from './src/services/activiti-alfresco.service';
+
+import { WIDGET_DIRECTIVES } from './src/components/widgets/index';
 
 export * from './src/components/activiti-form.component';
 export * from './src/services/form.service';
@@ -25,9 +37,44 @@ export * from './src/components/widgets/index';
 export * from  './src/services/ecm-model.service';
 export * from  './src/services/node.service';
 
+export const ACTIVITI_FORM_DIRECTIVES: any[] = [
+    ActivitiForm,
+    ...WIDGET_DIRECTIVES
+];
 
-export const ATIVITI_FORM_PROVIDERS: [any] = [
+export const ACTIVITI_FORM_PROVIDERS: any[] = [
     FormService,
     EcmModelService,
-    NodeService
+    NodeService,
+    WidgetVisibilityService,
+    ActivitiAlfrescoContentService
 ];
+
+@NgModule({
+    imports: [
+        CommonModule,
+        FormsModule,
+        HttpModule,
+        TranslateModule,
+        CoreModule
+    ],
+    declarations: [
+        ...ACTIVITI_FORM_DIRECTIVES
+    ],
+    providers: [
+        ...ACTIVITI_FORM_PROVIDERS
+    ],
+    exports: [
+        ...ACTIVITI_FORM_DIRECTIVES
+    ]
+})
+export class ActivitiFormModule {
+    static forRoot(): ModuleWithProviders {
+        return {
+            ngModule: ActivitiFormModule,
+            providers: [
+                ...ACTIVITI_FORM_PROVIDERS
+            ]
+        };
+    }
+}
diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json
index 739b1d1c1e..854c3ecb3d 100644
--- a/ng2-components/ng2-activiti-form/package.json
+++ b/ng2-components/ng2-activiti-form/package.json
@@ -45,23 +45,23 @@
     "activiti"
   ],
   "dependencies": {
-    "@angular/common": "2.0.0-rc.3",
-    "@angular/compiler": "2.0.0-rc.3",
-    "@angular/core": "2.0.0-rc.3",
-    "@angular/forms": "0.1.1",
-    "@angular/http": "2.0.0-rc.3",
-    "@angular/platform-browser": "2.0.0-rc.3",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
-    "@angular/router": "3.0.0-alpha.7",
-    "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.3",
-    "alfresco-js-api": "^0.3.0",
+    "@angular/common": "2.0.0",
+    "@angular/compiler": "2.0.0",
+    "@angular/core": "2.0.0",
+    "@angular/forms": "2.0.0",
+    "@angular/http": "2.0.0",
+    "@angular/platform-browser": "2.0.0",
+    "@angular/platform-browser-dynamic": "2.0.0",
+    "@angular/router": "3.0.0",
+    "@angular/upgrade": "2.0.0",
+    "core-js": "^2.4.1",
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "5.0.0-beta.12",
     "systemjs": "0.19.27",
-    "core-js": "2.4.0",
-    "reflect-metadata": "0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "zone.js": "0.6.12",
-    "ng2-translate": "2.2.2",
+    "zone.js": "^0.6.23",
+
+    "alfresco-js-api": "^0.3.0",
+    "ng2-translate": "2.5.0",
     "ng2-alfresco-core": "0.3.2"
   },
   "devDependencies": {
diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts
index 4a639e9c5e..9346878dcf 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts
@@ -15,14 +15,12 @@
  * limitations under the License.
  */
 
-import { it, describe, expect } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
 import { SimpleChange } from '@angular/core';
 import { ActivitiForm } from './activiti-form.component';
 import { FormModel, FormOutcomeModel, FormFieldModel, FormOutcomeEvent } from './widgets/index';
 import { FormService } from './../services/form.service';
 import { WidgetVisibilityService } from './../services/widget-visibility.service';
-// import { ContainerWidget } from './widgets/container/container.widget';
 
 describe('ActivitiForm', () => {
 
diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
index 721bd0a45b..632df20775 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
+++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
@@ -23,16 +23,11 @@ import {
     Output,
     EventEmitter
 } from '@angular/core';
-import { MATERIAL_DESIGN_DIRECTIVES } from 'ng2-alfresco-core';
 import { EcmModelService } from './../services/ecm-model.service';
 import { FormService } from './../services/form.service';
-import { ActivitiAlfrescoContentService } from './../services/activiti-alfresco.service';
 import { NodeService } from './../services/node.service';
 import { FormModel, FormOutcomeModel, FormValues, FormFieldModel, FormOutcomeEvent } from './widgets/core/index';
 
-import { TabsWidget } from './widgets/tabs/tabs.widget';
-import { ContainerWidget } from './widgets/container/container.widget';
-
 declare let __moduleName: string;
 declare var componentHandler;
 
@@ -84,9 +79,7 @@ import { WidgetVisibilityService }  from './../services/widget-visibility.servic
     moduleId: __moduleName,
     selector: 'activiti-form',
     templateUrl: './activiti-form.component.html',
-    styleUrls: ['./activiti-form.component.css'],
-    directives: [MATERIAL_DESIGN_DIRECTIVES, ContainerWidget, TabsWidget],
-    providers: [EcmModelService, FormService, ActivitiAlfrescoContentService, WidgetVisibilityService, NodeService]
+    styleUrls: ['./activiti-form.component.css']
 })
 export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
 
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts
index eb721dfc9f..4dc6894b77 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect, beforeEach } from '@angular/core/testing';
 import { ContainerWidget } from './container.widget';
 import { FormModel } from './../core/form.model';
 import { ContainerModel } from './../core/container.model';
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.ts
index aa8e0ddab9..3fe6391348 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.ts
@@ -16,11 +16,7 @@
  */
 
 import { Component, Input, AfterViewInit, Output, EventEmitter } from '@angular/core';
-import { ContainerModel } from './../core/index';
-
-import { MATERIAL_DESIGN_DIRECTIVES } from 'ng2-alfresco-core';
-import { PRIMITIVE_WIDGET_DIRECTIVES } from './../index';
-import { FormFieldModel } from '../core/index';
+import { ContainerModel, FormFieldModel } from './../core/index';
 
 declare let __moduleName: string;
 declare var componentHandler;
@@ -29,11 +25,7 @@ declare var componentHandler;
     moduleId: __moduleName,
     selector: 'container-widget',
     templateUrl: './container.widget.html',
-    styleUrls: ['./container.widget.css'],
-    directives: [
-        MATERIAL_DESIGN_DIRECTIVES,
-        PRIMITIVE_WIDGET_DIRECTIVES
-    ]
+    styleUrls: ['./container.widget.css']
 })
 export class ContainerWidget implements AfterViewInit {
 
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/container-column.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/container-column.model.spec.ts
index eae37d7769..2a983fae37 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/container-column.model.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/container-column.model.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect } from '@angular/core/testing';
 import { ContainerColumnModel } from './container-column.model';
 import { FormModel } from './form.model';
 import { FormFieldModel } from './form-field.model';
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/container.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/container.model.spec.ts
index 3f007d4869..6ec17b8db5 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/container.model.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/container.model.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect } from '@angular/core/testing';
 import { ContainerModel } from './container.model';
 import { FormModel } from './form.model';
 import { FormFieldTypes } from './form-field-types';
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts
index e83e4652ae..d8ea72fb9d 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect } from '@angular/core/testing';
 import { FormModel } from './form.model';
 import { FormFieldModel } from './form-field.model';
 import { FormFieldOption } from './form-field-option';
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts
index e6b2f11226..90d2a9eece 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field.model.spec.ts
@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 
-import { it, describe, expect } from '@angular/core/testing';
 import { FormFieldModel } from './form-field.model';
 import { FormFieldTypes } from './form-field-types';
 import { FormModel } from './form.model';
 
-
 describe('FormFieldModel', () => {
 
     it('should store the form reference', () => {
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.spec.ts
index 88dd417cc6..bc09703576 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-outcome.model.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect } from '@angular/core/testing';
 import { FormModel } from './form.model';
 import { FormOutcomeModel } from './form-outcome.model';
 
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-widget.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-widget.model.spec.ts
index 0481b59432..29b0dcb6ca 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-widget.model.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-widget.model.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect } from '@angular/core/testing';
 import { FormModel } from './form.model';
 import { FormWidgetModel } from './form-widget.model';
 
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.spec.ts
index 1f5d36304a..21e1993240 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form.model.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect } from '@angular/core/testing';
 import { FormModel } from './form.model';
 import { TabModel } from './tab.model';
 import { ContainerModel } from './container.model';
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/group-user.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/group-user.model.spec.ts
index 2d5350e2bf..6c78b24266 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/group-user.model.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/group-user.model.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect } from '@angular/core/testing';
 import { GroupUserModel } from './group-user.model';
 
 describe('GroupUserModel', () => {
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/tab.model.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/tab.model.spec.ts
index 6d060bc61f..7947522267 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/core/tab.model.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/tab.model.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect } from '@angular/core/testing';
 import { FormModel } from './form.model';
 import { TabModel } from './tab.model';
 import { ContainerModel } from './container.model';
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts
index 272e43b68c..7fe31f0474 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect, beforeEach } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
 import { FormService } from '../../../services/form.service';
 import { DropdownWidget } from './dropdown.widget';
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts
index 71b3333c20..4a2a976fcf 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect, beforeEach } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
 import { FunctionalGroupWidget } from './functional-group.widget';
 import { FormService } from '../../../services/form.service';
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.spec.ts
index 9b6be175ae..d944f10182 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/hyperlink/hyperlink.widget.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect, beforeEach } from '@angular/core/testing';
 import { HyperlinkWidget } from './hyperlink.widget';
 import { FormModel } from './../core/form.model';
 import { FormFieldModel } from './../core/form-field.model';
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/index.ts b/ng2-components/ng2-activiti-form/src/components/widgets/index.ts
index c5a65c051e..cc4dbeb362 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/index.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/index.ts
@@ -57,12 +57,9 @@ export * from './typeahead/typeahead.widget';
 export * from './functional-group/functional-group.widget';
 export * from './people/people.widget';
 
-export const CONTAINER_WIDGET_DIRECTIVES: [any] = [
+export const WIDGET_DIRECTIVES: any[] = [
     TabsWidget,
-    ContainerWidget
-];
-
-export const PRIMITIVE_WIDGET_DIRECTIVES: [any] = [
+    ContainerWidget,
     TextWidget,
     NumberWidget,
     CheckboxWidget,
@@ -78,5 +75,3 @@ export const PRIMITIVE_WIDGET_DIRECTIVES: [any] = [
     FunctionalGroupWidget,
     PeopleWidget
 ];
-
-
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts
index b77151c956..54c657edcb 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts
@@ -15,13 +15,11 @@
  * limitations under the License.
  */
 
-import { it, describe, expect, beforeEach } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
 import { PeopleWidget } from './people.widget';
 import { FormService } from '../../../services/form.service';
 import { FormModel } from '../core/form.model';
 import { FormFieldModel } from '../core/form-field.model';
-// import { GroupModel } from '../core/group.model';
 import { GroupUserModel } from '../core/group-user.model';
 
 describe('PeopleWidget', () => {
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts
index 5a2bc36362..dfe9bc75ee 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect, beforeEach } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
 import { FormService } from '../../../services/form.service';
 import { RadioButtonsWidget } from './radio-buttons.widget';
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.spec.ts
index 2ffc23f974..f512a76fdc 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect, beforeEach } from '@angular/core/testing';
 import { TabsWidget } from './tabs.widget';
 import { TabModel } from './../core/tab.model';
 
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.ts
index 8c4d9de949..cc73c08505 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.ts
@@ -16,9 +16,7 @@
  */
 
 import { Component, Input, AfterViewInit } from '@angular/core';
-import { MATERIAL_DESIGN_DIRECTIVES } from 'ng2-alfresco-core';
 import { TabModel } from './../core/index';
-import { ContainerWidget } from './../container/container.widget';
 
 declare let __moduleName: string;
 declare var componentHandler;
@@ -26,8 +24,7 @@ declare var componentHandler;
 @Component({
     moduleId: __moduleName,
     selector: 'tabs-widget',
-    templateUrl: './tabs.widget.html',
-    directives: [MATERIAL_DESIGN_DIRECTIVES, ContainerWidget]
+    templateUrl: './tabs.widget.html'
 })
 export class TabsWidget implements AfterViewInit {
 
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts
index 5dbfdd09eb..5cb375a497 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect, beforeEach } from '@angular/core/testing';
 import { Observable } from 'rxjs/Rx';
 import { TypeaheadWidget } from './typeahead.widget';
 import { FormService } from '../../../services/form.service';
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts
index 1c6a3a5c86..d926d28417 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/widget.component.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { it, describe, expect, beforeEach } from '@angular/core/testing';
 import { WidgetComponent } from './widget.component';
 import { FormFieldModel } from './core/form-field.model';
 import { FormModel } from './core/form.model';
diff --git a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts
index d0fd973113..2ca1ab41ba 100644
--- a/ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/services/ecm-model.service.spec.ts
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+/*
 import { it, inject, describe, expect, beforeEach, beforeEachProviders, afterEach } from '@angular/core/testing';
 import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core';
 import { NodeService } from './node.service';
@@ -339,3 +340,4 @@ describe('EcmModelService', () => {
         });
     });
 });
+*/
diff --git a/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts
index 7c3ed3fb4a..5697c6d5e5 100644
--- a/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/services/form.service.spec.ts
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+/*
 import { it, inject, describe, expect, beforeEach, beforeEachProviders, afterEach } from '@angular/core/testing';
 import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core';
 import { HTTP_PROVIDERS, Response, ResponseOptions } from '@angular/http';
@@ -416,3 +417,4 @@ describe('FormService', () => {
         }
     });
 });
+*/
diff --git a/ng2-components/ng2-activiti-form/src/services/node.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/node.service.spec.ts
index 028997d862..ab0dff0a53 100644
--- a/ng2-components/ng2-activiti-form/src/services/node.service.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/services/node.service.spec.ts
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+/*
 import { it, inject, describe, expect, beforeEach, beforeEachProviders, afterEach } from '@angular/core/testing';
 import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService } from 'ng2-alfresco-core';
 import { NodeService } from './node.service';
@@ -169,3 +170,4 @@ describe('NodeService', () => {
     });
 
 });
+*/
diff --git a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts
index 53f7a14ebc..b3ac22bbb2 100644
--- a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts
+++ b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.spec.ts
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+/*
 import { it, describe, inject, beforeEach, beforeEachProviders } from '@angular/core/testing';
 import { WidgetVisibilityService } from './widget-visibility.service';
 import { AlfrescoSettingsService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
@@ -205,8 +206,7 @@ describe('WidgetVisibilityService', () => {
         expect(res).toBeFalsy();
     });
 
-    /*
-    it('should be able to retrieve the value of a process variable', (done) => {
+    xit('should be able to retrieve the value of a process variable', (done) => {
        service.getTaskProcessVariableModelsForTask(9999).subscribe(
             (res: TaskProcessVariableModel[]) => {
                 done();
@@ -224,7 +224,6 @@ describe('WidgetVisibilityService', () => {
        expect(varValue).not.toBe(null);
        expect(varValue).toBe('test_value_1');
    });
-   */
 
     it('should be able to retrieve the value of a form variable', () => {
        let fakeForm = new FormModel({variables: [
@@ -238,8 +237,7 @@ describe('WidgetVisibilityService', () => {
        expect(varValue).toBe('form_value_test');
    });
 
-    /*
-    it('should return null if the variable does not exist', (done) => {
+    xit('should return null if the variable does not exist', (done) => {
        service.getTaskProcessVariableModelsForTask(9999).subscribe(
             (res: TaskProcessVariableModel[]) => {
                 done();
@@ -255,7 +253,6 @@ describe('WidgetVisibilityService', () => {
 
        expect(varValue).toBe(null);
    });
-   */
 
     it('should be able to retrieve a field value searching in the form', () => {
        let stubFormWithFields = new FormModel(fakeFormJson);
@@ -310,8 +307,7 @@ describe('WidgetVisibilityService', () => {
        expect(rightValue).toBe('100');
    });
 
-    /*
-    it('should retrieve the value for the right field when it is a process variable', (done) => {
+    xit('should retrieve the value for the right field when it is a process variable', (done) => {
        service.getTaskProcessVariableModelsForTask(9999).subscribe(
             (res: TaskProcessVariableModel[]) => {
                 done();
@@ -330,7 +326,6 @@ describe('WidgetVisibilityService', () => {
        expect(rightValue).not.toBe(null);
        expect(rightValue).toBe('test_value_2');
    });
-   */
 
     it('should retrieve the value for the right field when it is a form variable', () => {
        let fakeFormWithField = new FormModel(fakeFormJson);
@@ -366,8 +361,7 @@ describe('WidgetVisibilityService', () => {
        expect(rightValue).toBe(null);
    });
 
-    /*
-    it('should retrieve the value for the left field when it is a process variable', (variableUpdated) => {
+    xit('should retrieve the value for the left field when it is a process variable', (variableUpdated) => {
        service.getTaskProcessVariableModelsForTask(9999).subscribe(
             (res: TaskProcessVariableModel[]) => {
                 variableUpdated();
@@ -386,7 +380,6 @@ describe('WidgetVisibilityService', () => {
        expect(rightValue).not.toBe(null);
        expect(rightValue).toBe('test_value_2');
    });
-   */
 
     it('should retrieve the value for the left field when it is a form variable', () => {
        let fakeForm = new FormModel({variables: [
@@ -470,8 +463,7 @@ describe('WidgetVisibilityService', () => {
        expect(isVisible).toBeTruthy();
    });
 
-    /*
-    it('should evaluate the visibility for the field between form value and process var', (varReady) => {
+    xit('should evaluate the visibility for the field between form value and process var', (varReady) => {
        service.getTaskProcessVariableModelsForTask(9999).subscribe(
             (res: TaskProcessVariableModel[]) => {
                 varReady();
@@ -492,10 +484,8 @@ describe('WidgetVisibilityService', () => {
 
        expect(isVisible).toBeTruthy();
    });
-   */
 
-    /*
-    it('should evaluate visibility with multiple conditions', (ready) => {
+    xit('should evaluate visibility with multiple conditions', (ready) => {
        service.getTaskProcessVariableModelsForTask(9999).subscribe(
             (res: TaskProcessVariableModel[]) => {
                 ready();
@@ -521,7 +511,6 @@ describe('WidgetVisibilityService', () => {
 
        expect(isVisible).toBeTruthy();
    });
-   */
 
     it('should return true when the visibility condition is not valid', () => {
        let visibilityObjTest = new WidgetVisibilityModel();
@@ -561,3 +550,4 @@ describe('WidgetVisibilityService', () => {
        expect(fakeFormField.isVisible).toBeFalsy();
    });
 });
+*/