diff --git a/jest.preset.js b/jest.preset.js
index 093c935fb5bfa6..0d6abf1ef4a0af 100644
--- a/jest.preset.js
+++ b/jest.preset.js
@@ -18,7 +18,7 @@ const baseConfig = {
   },
   testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  testPathIgnorePatterns: ['/node_modules/', '/lib/', '/lib-commonjs/'],
+  testPathIgnorePatterns: ['/node_modules/', '/lib/', '/lib-commonjs/', '/dist/'],
   moduleNameMapper: { ...tsPathAliases },
   cacheDirectory: '<rootDir>/.cache/jest',
   clearMocks: true,
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 2c7ba9522b9943..14ac7a4a67feaf 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -12,8 +12,8 @@
     "typeRoots": ["node_modules/@types", "./typings"],
     "baseUrl": ".",
     "paths": {
-      "@fluentui/set-version": ["packages/set-version/src/index.ts"],
       "@fluentui/react-conformance": ["packages/react-conformance/src/index.ts"],
+      "@fluentui/react-context-selector": ["packages/react-context-selector/src/index.ts"],
       "@fluentui/react-utilities": ["packages/react-utilities/src/index.ts"],
       "@fluentui/react-make-styles": ["packages/react-make-styles/src/index.ts"],
       "@fluentui/make-styles": ["packages/make-styles/src/index.ts"],
@@ -21,11 +21,6 @@
       "@fluentui/react-theme": ["packages/react-theme/src/index.ts"],
       "@fluentui/react-theme-provider": ["packages/react-theme-provider/src/index.ts"],
       "@fluentui/keyboard-key": ["packages/keyboard-key/src/index.ts"],
-      "@fluentui/utilities": ["packages/utilities/src/index.ts"],
-      "@fluentui/merge-styles": ["packages/merge-styles/src/index.ts"],
-      "@fluentui/dom-utilities": ["packages/dom-utilities/src/index.ts"],
-      "@fluentui/theme": ["packages/theme/src/index.ts"],
-      "@fluentui/react-window-provider": ["packages/react-window-provider/src/index.ts"],
       "@fluentui/react-focus-management": ["packages/react-focus-management/src/index.ts"],
       "@fluentui/react-menu": ["packages/react-menu/src/index.ts"]
     }