diff --git a/projects/testing-library/src/lib/testing-library.ts b/projects/testing-library/src/lib/testing-library.ts
index c9ef6e0e..4bf0d109 100644
--- a/projects/testing-library/src/lib/testing-library.ts
+++ b/projects/testing-library/src/lib/testing-library.ts
@@ -292,8 +292,6 @@ function detectChangesForMountedFixtures() {
   mountedFixtures.forEach(fixture => fixture.detectChanges());
 }
 
-export * from '@testing-library/dom';
-
 const fireEvent = Object.keys(dtlFireEvent).reduce(
   (events, key) => {
     events[key] = (element: HTMLElement, options?: {}) => {
@@ -308,4 +306,80 @@ const fireEvent = Object.keys(dtlFireEvent).reduce(
 
 const screen = replaceFindWithFindAndDetectChanges(document.body, dtlScreen);
 
+// manually export otherwise we get the following error while running Jest tests
+// TypeError: Cannot set property fireEvent of [object Object] which has only a getter
+// exports.fireEvent = fireEvent;
+export {
+  buildQueries,
+  configure,
+  getByLabelText,
+  getAllByLabelText,
+  queryByLabelText,
+  queryAllByLabelText,
+  findByLabelText,
+  findAllByLabelText,
+  getByPlaceholderText,
+  getAllByPlaceholderText,
+  queryByPlaceholderText,
+  queryAllByPlaceholderText,
+  findByPlaceholderText,
+  findAllByPlaceholderText,
+  getByText,
+  getAllByText,
+  queryByText,
+  queryAllByText,
+  findByText,
+  findAllByText,
+  getByAltText,
+  getAllByAltText,
+  queryByAltText,
+  queryAllByAltText,
+  findByAltText,
+  findAllByAltText,
+  getByTitle,
+  getAllByTitle,
+  queryByTitle,
+  queryAllByTitle,
+  findByTitle,
+  findAllByTitle,
+  getByDisplayValue,
+  getAllByDisplayValue,
+  queryByDisplayValue,
+  queryAllByDisplayValue,
+  findByDisplayValue,
+  findAllByDisplayValue,
+  getByRole,
+  getAllByRole,
+  queryByRole,
+  queryAllByRole,
+  findByRole,
+  findAllByRole,
+  getByTestId,
+  getAllByTestId,
+  queryByTestId,
+  queryAllByTestId,
+  findByTestId,
+  findAllByTestId,
+  createEvent,
+  getDefaultNormalizer,
+  getElementError,
+  getNodeText,
+  getQueriesForElement,
+  getRoles,
+  isInaccessible,
+  logDOM,
+  logRoles,
+  prettyDOM,
+  queries,
+  queryAllByAttribute,
+  queryByAttribute,
+  queryHelpers,
+  wait,
+  waitFor,
+  waitForDomChange,
+  waitForElement,
+  waitForElementToBeRemoved,
+  within,
+} from '@testing-library/dom';
+
 export { fireEvent, screen };
diff --git a/projects/testing-library/src/lib/user-events/index.ts b/projects/testing-library/src/lib/user-events/index.ts
index 6dc2cee3..8b7066da 100644
--- a/projects/testing-library/src/lib/user-events/index.ts
+++ b/projects/testing-library/src/lib/user-events/index.ts
@@ -1,4 +1,3 @@
-import { fireEvent } from '@testing-library/dom';
 import { createType } from './type';
 import { createSelectOptions } from './selectOptions';
 import { tab } from './tab';
@@ -47,7 +46,4 @@ export interface UserEvents {
   tab: typeof tab;
 }
 
-const type = createType(fireEvent);
-const selectOptions = createSelectOptions(fireEvent);
-
-export { createType, type, createSelectOptions, selectOptions, tab };
+export { createType, createSelectOptions, tab };
diff --git a/projects/testing-library/src/public_api.ts b/projects/testing-library/src/public_api.ts
index 4fafd9b7..629018f6 100644
--- a/projects/testing-library/src/public_api.ts
+++ b/projects/testing-library/src/public_api.ts
@@ -3,5 +3,5 @@
  */
 
 export * from './lib/models';
-export * from './lib/testing-library';
 export * from './lib/user-events';
+export * from './lib/testing-library';
diff --git a/projects/testing-library/tsconfig.lib.json b/projects/testing-library/tsconfig.lib.json
index bc66cfa7..ee166bbf 100644
--- a/projects/testing-library/tsconfig.lib.json
+++ b/projects/testing-library/tsconfig.lib.json
@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
     "target": "es2015",
-    "module": "CommonJS",
+    "module": "ES2015",
     "moduleResolution": "node",
     "declaration": true,
     "sourceMap": true,