diff --git a/lib/mock-builder/mock-builder-promise.skip-dep.ts b/lib/mock-builder/mock-builder-promise.skip-dep.ts
index 9e193cd523..9a8719063e 100644
--- a/lib/mock-builder/mock-builder-promise.skip-dep.ts
+++ b/lib/mock-builder/mock-builder-promise.skip-dep.ts
@@ -1,7 +1,7 @@
 import { DOCUMENT } from '@angular/common';
-import { isNgInjectionToken } from 'ng-mocks';
 
 import ngConfig from '../common/core.config';
+import { isNgInjectionToken } from '../common/func.is-ng-injection-token';
 import ngMocksUniverse from '../common/ng-mocks-universe';
 
 // Checks if we should avoid mocking of the provider.
diff --git a/lib/mock-builder/mock-builder-promise.ts b/lib/mock-builder/mock-builder-promise.ts
index 62fc4edf3f..63126f01d1 100644
--- a/lib/mock-builder/mock-builder-promise.ts
+++ b/lib/mock-builder/mock-builder-promise.ts
@@ -1,6 +1,5 @@
 import { InjectionToken, NgModule, Provider } from '@angular/core';
 import { MetadataOverride, TestBed } from '@angular/core/testing';
-import { MockService, ngMocks } from 'ng-mocks';
 
 import { extractDependency, flatten, mapEntries, mapValues } from '../common/core.helpers';
 import { directiveResolver, jitReflector } from '../common/core.reflect';
@@ -12,10 +11,12 @@ import { isNgModuleDefWithProviders, NgModuleWithProviders } from '../common/fun
 import ngMocksUniverse from '../common/ng-mocks-universe';
 import { MockComponent } from '../mock-component/mock-component';
 import { MockDirective } from '../mock-directive/mock-directive';
+import { ngMocks } from '../mock-helper/mock-helper';
 import { MockModule, MockNgDef } from '../mock-module/mock-module';
 import { MockPipe } from '../mock-pipe/mock-pipe';
 import mockServiceHelper from '../mock-service/helper';
 import MockProvider from '../mock-service/mock-provider';
+import { MockService } from '../mock-service/mock-service';
 
 import extractDep from './mock-builder-promise.extract-dep';
 import skipDep from './mock-builder-promise.skip-dep';
diff --git a/lib/mock-helper/mock-helper.findAll.ts b/lib/mock-helper/mock-helper.findAll.ts
index 75701c185e..01effa840e 100644
--- a/lib/mock-helper/mock-helper.findAll.ts
+++ b/lib/mock-helper/mock-helper.findAll.ts
@@ -1,7 +1,8 @@
 import { By } from '@angular/platform-browser';
-import { MockedDebugElement, Type } from 'ng-mocks';
 
+import { Type } from '../common/core.types';
 import { getSourceOfMock } from '../common/func.get-source-of-mock';
+import { MockedDebugElement } from '../mock-render/types';
 
 import getLastFixture from './func.get-last-fixture';
 
diff --git a/tests/issue-162/test.spec.ts b/tests/issue-162/test.spec.ts
index 35b3328d43..e7617bd806 100644
--- a/tests/issue-162/test.spec.ts
+++ b/tests/issue-162/test.spec.ts
@@ -1,8 +1,7 @@
 import { Component, NgModule, RendererFactory2 } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { BrowserModule, EventManager } from '@angular/platform-browser';
-import { MockBuilder, ngMocks } from 'ng-mocks';
-import { MockRender } from 'ng-mocks/dist/lib/mock-render/mock-render';
+import { MockBuilder, MockRender, ngMocks } from 'ng-mocks';
 
 @Component({
   selector: 'app-root',
diff --git a/tests/issue-173/test.spec.ts b/tests/issue-173/test.spec.ts
index b1327ba5c9..6b70289922 100644
--- a/tests/issue-173/test.spec.ts
+++ b/tests/issue-173/test.spec.ts
@@ -1,6 +1,5 @@
 import { Directive, NgModule } from '@angular/core';
-import { MockBuilder } from 'ng-mocks';
-import { MockRender } from 'ng-mocks/dist/lib/mock-render/mock-render';
+import { MockBuilder, MockRender } from 'ng-mocks';
 
 @Directive({
   selector: 'child',