diff --git a/packages/react/src/hooks/__tests__/useController/expireAll.tsx b/packages/react/src/hooks/__tests__/useController/expireAll.tsx
index becdf75f7996..bbbd80872be3 100644
--- a/packages/react/src/hooks/__tests__/useController/expireAll.tsx
+++ b/packages/react/src/hooks/__tests__/useController/expireAll.tsx
@@ -1,6 +1,6 @@
 import { CacheProvider } from '@data-client/react';
 import { makeRenderDataClient, renderHook, act } from '@data-client/test';
-import { FixtureEndpoint } from '@data-client/test/mockState';
+import { FixtureEndpoint } from '@data-client/test';
 import { CoolerArticleResource, GetPhoto } from '__tests__/new';
 import nock from 'nock';
 import { useEffect } from 'react';
diff --git a/packages/react/src/hooks/__tests__/useController/invalidate.tsx b/packages/react/src/hooks/__tests__/useController/invalidate.tsx
index f97874d46552..5973a63c20c4 100644
--- a/packages/react/src/hooks/__tests__/useController/invalidate.tsx
+++ b/packages/react/src/hooks/__tests__/useController/invalidate.tsx
@@ -1,5 +1,5 @@
 import { CacheProvider } from '@data-client/react';
-import { FixtureEndpoint } from '@data-client/test/mockState';
+import { FixtureEndpoint } from '@data-client/test';
 import { FutureArticleResource, GetPhoto } from '__tests__/new';
 import nock from 'nock';
 import { useEffect } from 'react';
diff --git a/packages/react/src/hooks/__tests__/useController/invalidateAll.tsx b/packages/react/src/hooks/__tests__/useController/invalidateAll.tsx
index 240f79aa8161..32f9c17c19b4 100644
--- a/packages/react/src/hooks/__tests__/useController/invalidateAll.tsx
+++ b/packages/react/src/hooks/__tests__/useController/invalidateAll.tsx
@@ -1,6 +1,6 @@
 import { CacheProvider } from '@data-client/react';
 import { makeRenderDataClient, renderHook, act } from '@data-client/test';
-import { FixtureEndpoint } from '@data-client/test/mockState';
+import { FixtureEndpoint } from '@data-client/test';
 import { CoolerArticleResource, GetPhoto } from '__tests__/new';
 import nock from 'nock';
 import { useEffect } from 'react';
diff --git a/packages/react/src/hooks/__tests__/useController/reset.tsx b/packages/react/src/hooks/__tests__/useController/reset.tsx
index 200c0d444b3f..264e1172cb86 100644
--- a/packages/react/src/hooks/__tests__/useController/reset.tsx
+++ b/packages/react/src/hooks/__tests__/useController/reset.tsx
@@ -1,7 +1,7 @@
 import { CacheProvider } from '@data-client/react';
 import { makeRenderDataClient, renderHook } from '@data-client/test';
 import { act } from '@data-client/test';
-import { FixtureEndpoint } from '@data-client/test/mockState';
+import { FixtureEndpoint } from '@data-client/test';
 import { waitFor } from '@testing-library/react';
 import { CoolerArticleDetail, FutureArticleResource } from '__tests__/new';
 import nock from 'nock';
diff --git a/packages/react/src/hooks/__tests__/useController/setResponse.tsx b/packages/react/src/hooks/__tests__/useController/setResponse.tsx
index 571de7554803..c2c4b22e2e76 100644
--- a/packages/react/src/hooks/__tests__/useController/setResponse.tsx
+++ b/packages/react/src/hooks/__tests__/useController/setResponse.tsx
@@ -1,5 +1,5 @@
 import { CacheProvider } from '@data-client/react';
-import { FixtureEndpoint } from '@data-client/test/mockState';
+import { FixtureEndpoint } from '@data-client/test';
 import { CoolerArticle, FutureArticleResource } from '__tests__/new';
 import nock from 'nock';
 
diff --git a/packages/react/src/hooks/__tests__/useController/subscribe.tsx b/packages/react/src/hooks/__tests__/useController/subscribe.tsx
index d98f1f9995e1..cc71919e848d 100644
--- a/packages/react/src/hooks/__tests__/useController/subscribe.tsx
+++ b/packages/react/src/hooks/__tests__/useController/subscribe.tsx
@@ -1,5 +1,5 @@
 import { CacheProvider } from '@data-client/react';
-import { FixtureEndpoint } from '@data-client/test/mockState';
+import { FixtureEndpoint } from '@data-client/test';
 import { FutureArticleResource } from '__tests__/new';
 import nock from 'nock';
 
diff --git a/tsconfig-base.json b/tsconfig-base.json
index 056581974d7b..0233329fa5f4 100644
--- a/tsconfig-base.json
+++ b/tsconfig-base.json
@@ -38,7 +38,7 @@
 
     /* Module Resolution Options */
     "resolveJsonModule": true,
-    "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    "moduleResolution": "bundler",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
     "moduleSuffixes": ["", ".native"],
     // "rootDirs": ["./src"],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
     //"typeRoots": [],                       /* List of folders to include type definitions from. */