diff --git a/package.json b/package.json
index 0d7f7ba0a..33357c8f3 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,8 @@
     "docs:deploy": "docs/deploy.sh",
     "lint": "eslint . --ext .ts,.js",
     "check": "npm run lint && npm run test",
-    "check:ts": "tsc --noEmit --esModuleInterop dist/index.d.ts",
+    "check:ts": "tsc --noEmit",
+    "check:ts:build": "tsc --noEmit --esModuleInterop dist/index.d.ts",
     "build": "npm run check && run-s build:*",
     "build:js": "grapesjs-cli build --targets=\"> 1%, ie 11, safari 8, not dead\" --statsOutput=\"stats.json\" --localePath=\"src/i18n/locale\"",
     "build:css": "sass src/styles/scss/main.scss dist/css/grapes.min.css --no-source-map --style=compressed --load-path=node_modules",
diff --git a/src/block_manager/index.ts b/src/block_manager/index.ts
index 387147dee..0496874c6 100644
--- a/src/block_manager/index.ts
+++ b/src/block_manager/index.ts
@@ -352,7 +352,7 @@ export default class BlockManager extends ItemManagerModule<BlockManagerConfig,
    * const newBlocksEl = blockManager.render(filtered, { external: true });
    * document.getElementById('some-id').appendChild(newBlocksEl);
    */
-  render(blocks: Block[], opts: { external?: boolean } = {}) {
+  render(blocks?: Block[], opts: { external?: boolean } = {}) {
     const { categories, config, em } = this;
     const toRender = blocks || this.getAll().models;
 
diff --git a/test/specs/block_manager/index.js b/test/specs/block_manager/index.ts
similarity index 88%
rename from test/specs/block_manager/index.js
rename to test/specs/block_manager/index.ts
index 5dc14e097..c92695a4b 100644
--- a/test/specs/block_manager/index.js
+++ b/test/specs/block_manager/index.ts
@@ -1,11 +1,12 @@
-import Editor from 'editor';
+import { BlockProperties } from '../../../src/block_manager/model/Block';
+import Editor from '../../../src/editor';
 
 describe('BlockManager', () => {
   describe('Main', () => {
-    let obj;
-    let idTest;
-    let optsTest;
-    let editor;
+    let obj: Editor['Blocks'];
+    const idTest = 'h1-block';
+    let optsTest: BlockProperties = { label: '', content: '' };
+    let editor: Editor;
 
     beforeEach(() => {
       editor = new Editor({
@@ -13,8 +14,6 @@ describe('BlockManager', () => {
           blocks: [],
         },
       });
-
-      idTest = 'h1-block';
       optsTest = {
         label: 'Heading',
         content: '<h1>Test</h1>',
@@ -25,7 +24,6 @@ describe('BlockManager', () => {
 
     afterEach(() => {
       editor.destroy();
-      obj = null;
     });
 
     test('Object exists', () => {
@@ -54,12 +52,12 @@ describe('BlockManager', () => {
     test('Add block with attributes', () => {
       optsTest.attributes = { class: 'test' };
       var model = obj.add(idTest, optsTest);
-      expect(model.get('attributes').class).toEqual('test');
+      expect(model.get('attributes')!.class).toEqual('test');
     });
 
     test('The id of the block is unique', () => {
       var model = obj.add(idTest, optsTest);
-      var model2 = obj.add(idTest, { other: 'test' });
+      var model2 = obj.add(idTest, { ...optsTest, content: 'test' });
       expect(model).toEqual(model2);
     });