diff --git a/src/modules/applications/components/applications-item-detail/applications-item-detail.component.spec.ts b/src/modules/applications/components/applications-item-detail/applications-item-detail.component.spec.ts
index c92cc679..a63ea31a 100644
--- a/src/modules/applications/components/applications-item-detail/applications-item-detail.component.spec.ts
+++ b/src/modules/applications/components/applications-item-detail/applications-item-detail.component.spec.ts
@@ -4,13 +4,14 @@ import { RouterModule } from '@angular/router';
 import { SharedModule } from '@shared/shared.module';
 import { ApplicationsItemDetailComponent } from './applications-item-detail.component';
 
-import { HttpClient, HttpHandler } from '@angular/common/http';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { LoaderStateService, InfluxDBService } from '@core/services';
 import { HttpService } from '@core/services/http';
 import { MetricsService } from '@core/services/metrics/metrics.service';
 import { DialogService } from '@dialog/dialog.service';
-import { Store } from '@ngrx/store';
+import { application } from '@testing/factories/application';
 import { MockStoreProvider } from '@testing/mocks';
+import { of } from 'rxjs';
 
 describe('ApplicationsItemDetailComponent', () => {
     let component: ApplicationsItemDetailComponent;
@@ -23,6 +24,7 @@ describe('ApplicationsItemDetailComponent', () => {
                 SharedModule,
                 RouterModule,
                 SharedModule,
+                HttpClientTestingModule,
             ],
             providers: [
                 MockStoreProvider,
@@ -30,8 +32,6 @@ describe('ApplicationsItemDetailComponent', () => {
                 MetricsService,
                 LoaderStateService,
                 InfluxDBService,
-                HttpHandler,
-                HttpClient,
                 HttpService,
             ],
         })
@@ -41,6 +41,8 @@ describe('ApplicationsItemDetailComponent', () => {
     beforeEach(() => {
         fixture = TestBed.createComponent(ApplicationsItemDetailComponent);
         component = fixture.componentInstance;
+        component.application$ = of(application);
+
         fixture.detectChanges();
     });
 
diff --git a/src/modules/applications/components/applications-stage-detail/applications-stage-detail.component.spec.ts b/src/modules/applications/components/applications-stage-detail/applications-stage-detail.component.spec.ts
index c68daed2..3eb6ffbb 100644
--- a/src/modules/applications/components/applications-stage-detail/applications-stage-detail.component.spec.ts
+++ b/src/modules/applications/components/applications-stage-detail/applications-stage-detail.component.spec.ts
@@ -25,8 +25,7 @@ describe('ApplicationsStageDetailComponent', () => {
                 MockStoreProvider,
                 DialogService,
             ],
-        })
-            .compileComponents();
+        }).compileComponents();
     }));
 
     beforeEach(() => {
diff --git a/src/modules/applications/components/dialogs/dialog-add-application/dialog-add-application.component.spec.ts b/src/modules/applications/components/dialogs/dialog-add-application/dialog-add-application.component.spec.ts
index 35643e05..bae04910 100644
--- a/src/modules/applications/components/dialogs/dialog-add-application/dialog-add-application.component.spec.ts
+++ b/src/modules/applications/components/dialogs/dialog-add-application/dialog-add-application.component.spec.ts
@@ -33,8 +33,7 @@ describe('DialogAddApplicationComponent', () => {
                 MockStoreProvider,
                 CustomValidatorsService,
             ],
-        })
-            .compileComponents();
+        }).compileComponents();
     }));
 
     beforeEach(() => {
diff --git a/src/modules/applications/components/dialogs/dialog-update-application/dialog-update-application.component.html b/src/modules/applications/components/dialogs/dialog-update-application/dialog-update-application.component.html
index 631d4859..76c93475 100644
--- a/src/modules/applications/components/dialogs/dialog-update-application/dialog-update-application.component.html
+++ b/src/modules/applications/components/dialogs/dialog-update-application/dialog-update-application.component.html
@@ -1,4 +1,4 @@
-<hydro-application-form (onSubmit)="onSubmit($event)" [data]="data" #form></hydro-application-form>
+<hydro-application-form (onSubmit)="onSubmit($event)" [data]="application" #form></hydro-application-form>
 <div class="dialog__footer">
     <div class="buttons-group">
         <div class="button button--flat button--large" (click)="onClose()">cancel</div>
diff --git a/src/modules/applications/components/dialogs/dialog-update-application/dialog-update-application.component.spec.ts b/src/modules/applications/components/dialogs/dialog-update-application/dialog-update-application.component.spec.ts
index 03d4b2e2..c3fffa5e 100644
--- a/src/modules/applications/components/dialogs/dialog-update-application/dialog-update-application.component.spec.ts
+++ b/src/modules/applications/components/dialogs/dialog-update-application/dialog-update-application.component.spec.ts
@@ -6,8 +6,10 @@ import { ApplicationFormComponent, KafkaFormComponent, ServiceFormComponent } fr
 import { CustomValidatorsService } from '@core/services/custom-validators.service';
 import { DialogService } from '@dialog/dialog.service';
 import { SharedModule } from '@shared/shared.module';
-import { MockSelectedApplication, MockSelectedUpdApplication, MockStoreProvider } from '@testing/mocks';
-import { DialogUpdateApplicationComponent } from './dialog-update-application.component';
+import { application } from '@testing/factories/application';
+import { MockStoreProvider } from '@testing/mocks';
+import { of } from 'rxjs';
+import { DialogUpdateApplicationComponent, SELECTED_UPD_APPLICATION$ } from './dialog-update-application.component';
 
 describe('DialogUpdateApplicationComponent', () => {
     let component: DialogUpdateApplicationComponent;
@@ -27,13 +29,12 @@ describe('DialogUpdateApplicationComponent', () => {
                 ServiceFormComponent,
             ],
             providers: [
-                MockSelectedUpdApplication,
+                { provide: SELECTED_UPD_APPLICATION$, useValue: of(application) },
                 MockStoreProvider,
                 DialogService,
                 CustomValidatorsService,
             ],
-        })
-            .compileComponents();
+        }).compileComponents();
     }));
 
     beforeEach(() => {
diff --git a/src/modules/applications/components/dialogs/dialog-update-application/dialog-update-application.component.ts b/src/modules/applications/components/dialogs/dialog-update-application/dialog-update-application.component.ts
index 25022064..e9660b01 100644
--- a/src/modules/applications/components/dialogs/dialog-update-application/dialog-update-application.component.ts
+++ b/src/modules/applications/components/dialogs/dialog-update-application/dialog-update-application.component.ts
@@ -16,21 +16,21 @@ export let SELECTED_UPD_APPLICATION$ = new InjectionToken<Observable<Application
     templateUrl: './dialog-update-application.component.html',
 })
 export class DialogUpdateApplicationComponent implements OnInit, OnDestroy {
-    public data$: Observable<Application>;
-    public dataSub: Subscription;
-    public data: Application;
+    public application$: Observable<Application>;
+    public applicationSub: Subscription;
+    public application: Application;
 
     constructor(
-        @Inject(SELECTED_UPD_APPLICATION$) data: Observable<Application>,
+        @Inject(SELECTED_UPD_APPLICATION$) application: Observable<Application>,
         public store: Store<HydroServingState>,
         public dialog: DialogService
     ) {
-        this.data$ = data;
+        this.application$ = application;
     }
 
     ngOnInit(): void {
-        this.dataSub = this.data$.subscribe(data => {
-            this.data = data;
+        this.applicationSub = this.application$.subscribe(application => {
+            this.application = application;
         });
     }
 
@@ -39,7 +39,7 @@ export class DialogUpdateApplicationComponent implements OnInit, OnDestroy {
     }
 
     public onSubmit(formData) {
-        formData.id = this.data.id;
+        formData.id = this.application.id;
         const application = new Application(formData);
         this.store.dispatch(new HydroActions.UpdateApplicationAction(application));
 
@@ -47,6 +47,6 @@ export class DialogUpdateApplicationComponent implements OnInit, OnDestroy {
     }
 
     ngOnDestroy(): void {
-        this.dataSub.unsubscribe();
+        this.applicationSub.unsubscribe();
     }
 }
diff --git a/src/modules/applications/components/forms/service-form/service-form.component.ts b/src/modules/applications/components/forms/service-form/service-form.component.ts
index 6d5a69c3..bcd3883c 100644
--- a/src/modules/applications/components/forms/service-form/service-form.component.ts
+++ b/src/modules/applications/components/forms/service-form/service-form.component.ts
@@ -75,7 +75,7 @@ export class ServiceFormComponent implements OnInit {
         this.modelVersionIdControl.setValue(this.serviceFormService.getDefaultModelVersion().id);
     }
 
-    public onModelVersionChange(modelVersionId): void {
+    public onModelVersionChange(modelVersionId: number): void {
         this.signatureName.patchValue(this.serviceFormService.getSignature(modelVersionId));
     }
 
diff --git a/src/modules/applications/services/applications-builder.service.ts b/src/modules/applications/services/applications-builder.service.ts
index bb0a3fd5..bc8f97fc 100644
--- a/src/modules/applications/services/applications-builder.service.ts
+++ b/src/modules/applications/services/applications-builder.service.ts
@@ -22,11 +22,10 @@ export class ApplicationsBuilderService {
             id,
             contract,
             name: props.name,
-            executionGraph: props.executionGraph,
-            kafkaStreaming: props.kafkaStreaming,
+            executionGraph: props.executionGraph || [],
+            kafkaStreaming: props.kafkaStreaming || [],
         });
 
         return application;
     }
-
 }
diff --git a/src/modules/applications/services/service-form.service.ts b/src/modules/applications/services/service-form.service.ts
index 93dd4427..a9866dcd 100644
--- a/src/modules/applications/services/service-form.service.ts
+++ b/src/modules/applications/services/service-form.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, Type } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 
 import { Store } from '@ngrx/store';
@@ -48,9 +48,14 @@ export class ServiceFormService implements OnDestroy {
         );
     }
 
-    public getSignature(versionId): string {
-        const modelVersion = this.allModelVersions.find(version => version.id === versionId);
-        return hocon(modelVersion.modelContract).signatures.signature_name;
+    public getSignature(modelVersionId: number): string {
+        const modelVer = this.allModelVersions.find(version => version.id === modelVersionId);
+        try {
+            return hocon(modelVer.modelContract).signatures.signature_name;
+        } catch (err) {
+            console.error(err);
+            return '';
+        }
     }
 
     public getModelVersions(): Observable<any> {
@@ -78,7 +83,7 @@ export class ServiceFormService implements OnDestroy {
         const modelId = this.defaultModelId();
         this.updateModelVersionList(modelId);
         const modelVersion = this.getDefaultModelVersion();
-        const signatureName = this.getSignature(modelVersion.id);
+        const signatureName = modelVersion ? this.getSignature(modelVersion.id) : '';
 
         return {
             weight: 100,
@@ -90,7 +95,7 @@ export class ServiceFormService implements OnDestroy {
             },
             signatureName,
             modelVersion: {
-                id: modelVersion.id,
+                id: modelVersion && modelVersion.id,
                 model: {
                     id: modelId,
                 },
@@ -106,7 +111,7 @@ export class ServiceFormService implements OnDestroy {
         );
         const runtime = new FormControl(service.runtime.id, this.customValidators.required());
         const signatureName = new FormControl(
-            service.signatureName || this.getSignature(service.modelVersion.id),
+            service.signatureName || this.getSignature(service.modelVersion && service.modelVersion.id),
             [this.customValidators.required(), this.customValidators.pattern(/[a-zA-Z0-9]+/)]
         );
         const model = new FormGroup({
@@ -130,13 +135,13 @@ export class ServiceFormService implements OnDestroy {
     }
 
     private defaultRuntimeId() {
-        if (this.runtimes) {
+        if (this.runtimes[0]) {
             return this.runtimes[0].id;
         }
     }
 
     private defaultModelId() {
-        if (this.models.length) {
+        if (this.models[0]) {
             return this.models[0].id;
         }
     }
diff --git a/src/modules/core/services/command-creator/command-creator.ts b/src/modules/core/services/command-creator/command-creator.ts
index 969bb5a2..73e040b6 100644
--- a/src/modules/core/services/command-creator/command-creator.ts
+++ b/src/modules/core/services/command-creator/command-creator.ts
@@ -32,6 +32,8 @@ export abstract class CommandCreator {
     abstract getCommand(application: Application): string;
 
     protected getApplicationContract({contract}: Application): IApplicationContract {
-        return hocon(contract);
+        if (contract) {
+            return hocon(contract);
+        }
     }
 }
diff --git a/src/modules/core/services/command-creator/curl-command-creator.ts b/src/modules/core/services/command-creator/curl-command-creator.ts
index d4ce3eaf..389f5c50 100644
--- a/src/modules/core/services/command-creator/curl-command-creator.ts
+++ b/src/modules/core/services/command-creator/curl-command-creator.ts
@@ -3,6 +3,8 @@ import { Application } from '@shared/_index';
 import { CommandCreator, IApplicationContract } from './command-creator';
 
 export class CurlCommandCreator extends CommandCreator {
+    readonly headers: string = `--header 'Content-Type: application/json' --header 'Accept: application/json'`;
+
     get apiUrl() {
         if (environment.production) {
             const { protocol, hostname } = window.location;
@@ -13,12 +15,14 @@ export class CurlCommandCreator extends CommandCreator {
     }
 
     getCommand(application: Application): string {
-        const headers = `--header 'Content-Type: application/json' --header 'Accept: application/json'`;
-        const { input, name } = application;
-        const contract: IApplicationContract = this.getApplicationContract(application);
-        const url: string = `${this.apiUrl}/gateway/applications/${name}/${contract.signatures.signature_name}`;
-
-        return `curl -X POST ${headers} -d '${this.removeNewLineSymbolsFromString(input)}' '${url}'`.trim();
+        try {
+            const { input, name } = application;
+            const contract: IApplicationContract = this.getApplicationContract(application);
+            const url: string = `${this.apiUrl}/gateway/applications/${name}/${contract.signatures.signature_name}`;
+            return `curl -X POST ${this.headers} -d '${this.removeNewLineSymbolsFromString(input)}' '${url}'`.trim();
+        } catch (err) {
+            return 'invalid contract';
+        }
     }
 
     private removeNewLineSymbolsFromString(str: string = ''): string {
diff --git a/src/modules/core/services/command-creator/grpc-command-creator.ts b/src/modules/core/services/command-creator/grpc-command-creator.ts
index cefd38b3..28c6c0a0 100644
--- a/src/modules/core/services/command-creator/grpc-command-creator.ts
+++ b/src/modules/core/services/command-creator/grpc-command-creator.ts
@@ -64,7 +64,7 @@ export class GrpcCommandCreator extends CommandCreator {
 
             return { inputKey, inputValue };
         } catch {
-            return {inputKey: ' %input key% ', inputValue: '%input value% '};
+            return { inputKey: ' %input key% ', inputValue: '%input value% ' };
         }
     }
 
diff --git a/src/modules/models/components/model-details/model-details.component.spec.ts b/src/modules/models/components/model-details/model-details.component.spec.ts
index 2b4c4a77..50f712c0 100644
--- a/src/modules/models/components/model-details/model-details.component.spec.ts
+++ b/src/modules/models/components/model-details/model-details.component.spec.ts
@@ -1,6 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { RouterTestingModule } from '@angular/router/testing';
+import { DialogService } from '@dialog/dialog.service';
 import { SharedModule } from '@shared/shared.module';
+import { MockStoreProvider } from '@testing/mocks';
+import { MomentModule } from 'angular2-moment';
 import { ModelDetailsComponent } from './model-details.component';
 
 describe('ModelDetailsComponent', () => {
@@ -9,9 +13,17 @@ describe('ModelDetailsComponent', () => {
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
-            declarations: [ModelDetailsComponent],
+            declarations: [
+                ModelDetailsComponent,
+            ],
             imports: [
                 SharedModule,
+                MomentModule,
+                RouterTestingModule,
+            ],
+            providers: [
+                MockStoreProvider,
+                DialogService,
             ],
         })
             .compileComponents();
diff --git a/src/modules/models/components/model-version-details/model-version-details.component.spec.ts b/src/modules/models/components/model-version-details/model-version-details.component.spec.ts
index 8a8bc440..8620ea8d 100644
--- a/src/modules/models/components/model-version-details/model-version-details.component.spec.ts
+++ b/src/modules/models/components/model-version-details/model-version-details.component.spec.ts
@@ -1,7 +1,20 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { MdlSelectModule } from '@angular-mdl/select';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { SignaturesService, LoaderStateService } from '@core/services';
+import { HttpService } from '@core/services/http';
+import {
+    DataComparisonHistogramComponent
+} from '@profiles/components/data-comparison-histogram/data-comparison-histogram.component';
+import { DataProfilesComponent } from '@profiles/components/data-profiles/data-profiles.component';
+import { DataStatsComponent } from '@profiles/components/data-stats/data-stats.component';
 import { SharedModule } from '@shared/shared.module';
+import { modelBuild } from '@testing/factories/modelBuild';
+import { MockStoreProvider } from '@testing/mocks';
+import { MomentModule } from 'angular2-moment';
+import { of } from 'rxjs';
 import { ModelVersionDetailsComponent } from './model-version-details.component';
 
 describe('ModelVersionDetailsComponent', () => {
@@ -10,23 +23,38 @@ describe('ModelVersionDetailsComponent', () => {
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
-            declarations: [ModelVersionDetailsComponent],
+            declarations: [
+                ModelVersionDetailsComponent,
+                DataProfilesComponent,
+                DataComparisonHistogramComponent,
+                DataStatsComponent,
+            ],
             imports: [
+                MdlSelectModule,
                 SharedModule,
                 RouterTestingModule,
+                MomentModule,
+                HttpClientTestingModule,
+            ],
+            providers: [
+                MockStoreProvider,
+                SignaturesService,
+                HttpService,
+                LoaderStateService,
             ],
-        })
-            .compileComponents();
+        }).compileComponents();
     }));
 
     beforeEach(() => {
         fixture = TestBed.createComponent(ModelVersionDetailsComponent);
         component = fixture.componentInstance;
+        // TODO: mock store
+        component.build$ = of(modelBuild);
+
         fixture.detectChanges();
     });
 
     it('it should be created', () => {
         expect(component).toBeTruthy();
     });
-
 });
diff --git a/src/modules/models/components/model-version-details/model-version-details.component.ts b/src/modules/models/components/model-version-details/model-version-details.component.ts
index 3930dd9d..b51c75f3 100644
--- a/src/modules/models/components/model-version-details/model-version-details.component.ts
+++ b/src/modules/models/components/model-version-details/model-version-details.component.ts
@@ -22,8 +22,6 @@ export class ModelVersionDetailsComponent implements OnInit, OnDestroy {
         'Field name', 'Data type', 'Shape',
     ];
 
-    public contracts: Signature[];
-    public build: any;
     public build$: Observable<ModelBuild>;
 
     public modelId: number;
diff --git a/src/modules/shared/components/form/select/select.component.spec.ts b/src/modules/shared/components/form/select/select.component.spec.ts
index 824e4981..6c7fa0e1 100644
--- a/src/modules/shared/components/form/select/select.component.spec.ts
+++ b/src/modules/shared/components/form/select/select.component.spec.ts
@@ -1,20 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { HydroSelectComponent } from '@shared/components/form/select/select.component';
 
-import { InputTextComponent } from '@shared/components/form/input-text/input-text.component';
-
-describe('InputTextComponent', () => {
-    let component: InputTextComponent;
-    let fixture: ComponentFixture<InputTextComponent>;
+describe('SelectComponent', () => {
+    let component: HydroSelectComponent;
+    let fixture: ComponentFixture<HydroSelectComponent>;
 
     beforeEach(async(() => {
         TestBed.configureTestingModule({
-            declarations: [InputTextComponent],
+            declarations: [HydroSelectComponent],
         })
             .compileComponents();
     }));
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(InputTextComponent);
+        fixture = TestBed.createComponent(HydroSelectComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
     });
diff --git a/src/modules/shared/components/form/textarea/textarea.component.spec.ts b/src/modules/shared/components/form/textarea/textarea.component.spec.ts
index 8d072aaa..c1f065ee 100644
--- a/src/modules/shared/components/form/textarea/textarea.component.spec.ts
+++ b/src/modules/shared/components/form/textarea/textarea.component.spec.ts
@@ -15,8 +15,7 @@ describe('TextareaComponent', () => {
                 SharedModule,
                 FormsModule,
             ],
-        })
-            .compileComponents();
+        }).compileComponents();
     }));
 
     beforeEach(() => {
diff --git a/src/modules/shared/components/sidebar/sidebar.component.spec.ts b/src/modules/shared/components/sidebar/sidebar.component.spec.ts
index d8fe25e3..ac848b79 100644
--- a/src/modules/shared/components/sidebar/sidebar.component.spec.ts
+++ b/src/modules/shared/components/sidebar/sidebar.component.spec.ts
@@ -2,6 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { RouterTestingModule } from '@angular/router/testing';
 import { SharedModule } from '@shared/shared.module';
+import { of } from 'rxjs';
 import { SidebarComponent } from './sidebar.component';
 
 describe('SidebarComponent', () => {
@@ -16,13 +17,13 @@ describe('SidebarComponent', () => {
                 SharedModule,
                 RouterTestingModule,
             ],
-        })
-            .compileComponents();
+        }).compileComponents();
     }));
 
     beforeEach(() => {
         fixture = TestBed.createComponent(SidebarComponent);
         component = fixture.componentInstance;
+        component.sidebarData = of([]);
         fixture.detectChanges();
     });
 
diff --git a/src/testing/factories/application.ts b/src/testing/factories/application.ts
new file mode 100644
index 00000000..a7823dc9
--- /dev/null
+++ b/src/testing/factories/application.ts
@@ -0,0 +1,6 @@
+import { ApplicationsBuilderService } from '@applications/services';
+import { Application } from '@shared/_index';
+
+const applicationBuilder = new ApplicationsBuilderService();
+export const application: Application = applicationBuilder.build({});
+console.warn(application);
diff --git a/src/testing/factories/modelBuild.ts b/src/testing/factories/modelBuild.ts
new file mode 100644
index 00000000..e5543112
--- /dev/null
+++ b/src/testing/factories/modelBuild.ts
@@ -0,0 +1,5 @@
+import { ModelBuildBuilder, ModelVersionBuilder } from '@core/builders/_index';
+
+const modelVerBuilder = new ModelVersionBuilder();
+const modelBuildBuilder: ModelBuildBuilder = new ModelBuildBuilder(modelVerBuilder);
+export const modelBuild = modelBuildBuilder.build({});
diff --git a/src/testing/mocks.ts b/src/testing/mocks.ts
index d48194f2..4b4aaf34 100644
--- a/src/testing/mocks.ts
+++ b/src/testing/mocks.ts
@@ -17,5 +17,4 @@ export const MockStoreProvider: Provider = { provide: Store, useValue: MockStore
 export const MockActivatedRouterProvider: Provider = { provide: ActivatedRoute, useValue: {}};
 export const MockRouterProvider: Provider = { provide: Router, useValue: MockRouter};
 export const MockSelectedApplication: Provider = { provide: SELECTED_APPLICATION$, useValue: of({})};
-export const MockSelectedUpdApplication: Provider = { provide: SELECTED_UPD_APPLICATION$, useValue: of({})};
 export const MockSelectedServiceProvider: Provider = { provide: SELECTED_SERVICE, useValue: {}};