diff --git a/src/common/utils/withContext/index.ts b/src/common/utils/withContext/index.ts
index 321a2cd..d0aa0e2 100644
--- a/src/common/utils/withContext/index.ts
+++ b/src/common/utils/withContext/index.ts
@@ -1,3 +1,2 @@
+export * as testHelpers from './contextTestHelpers';
 export * from './withContext';
-export { testHelpers };
-import * as testHelpers from './contextTestHelpers';
diff --git a/src/design-system/atoms/avatar/index.ts b/src/design-system/atoms/avatar/index.ts
index a56b5ef..4c4c37e 100644
--- a/src/design-system/atoms/avatar/index.ts
+++ b/src/design-system/atoms/avatar/index.ts
@@ -1,4 +1,2 @@
 export * from './Avatar';
-export { utils };
-
-import * as utils from './avatarUtils';
+export * as utils from './avatarUtils';