5 files changed, 12 insertions, 30 deletions
diff --git a/test/unit/data/composite/common-utilities/exposeConstant.js b/test/unit/data/composite/control-flow/exposeConstant.js
index bfed0951..0c75894b 100644
--- a/test/unit/data/composite/common-utilities/exposeConstant.js
+++ b/test/unit/data/composite/control-flow/exposeConstant.js
@@ -1,11 +1,7 @@
 import t from 'tap';
 
-import {
-  compositeFrom,
-  continuationSymbol,
-  exposeConstant,
-  input,
-} from '#composite';
+import {compositeFrom, continuationSymbol, input} from '#composite';
+import {exposeConstant} from '#composite/control-flow';
 
 t.test(`exposeConstant: basic behavior`, t => {
   t.plan(2);
diff --git a/test/unit/data/composite/common-utilities/exposeDependency.js b/test/unit/data/composite/control-flow/exposeDependency.js
index 4f07cc16..8f6bfd01 100644
--- a/test/unit/data/composite/common-utilities/exposeDependency.js
+++ b/test/unit/data/composite/control-flow/exposeDependency.js
@@ -1,11 +1,7 @@
 import t from 'tap';
 
-import {
-  compositeFrom,
-  continuationSymbol,
-  exposeDependency,
-  input,
-} from '#composite';
+import {compositeFrom, continuationSymbol, input} from '#composite';
+import {exposeDependency} from '#composite/control-flow';
 
 t.test(`exposeDependency: basic behavior`, t => {
   t.plan(4);
diff --git a/test/unit/data/composite/common-utilities/withResultOfAvailabilityCheck.js b/test/unit/data/composite/control-flow/withResultOfAvailabilityCheck.js
index 50c127d3..4c4be04a 100644
--- a/test/unit/data/composite/common-utilities/withResultOfAvailabilityCheck.js
+++ b/test/unit/data/composite/control-flow/withResultOfAvailabilityCheck.js
@@ -1,11 +1,7 @@
 import t from 'tap';
 
-import {
-  compositeFrom,
-  continuationSymbol,
-  input,
-  withResultOfAvailabilityCheck,
-} from '#composite';
+import {compositeFrom, continuationSymbol, input} from '#composite';
+import {withResultOfAvailabilityCheck} from '#composite/control-flow';
 
 const composite = compositeFrom({
   compose: false,
diff --git a/test/unit/data/composite/common-utilities/withPropertiesFromObject.js b/test/unit/data/composite/data/withPropertiesFromObject.js
index 3431382e..ead1b9b2 100644
--- a/test/unit/data/composite/common-utilities/withPropertiesFromObject.js
+++ b/test/unit/data/composite/data/withPropertiesFromObject.js
@@ -1,11 +1,8 @@
 import t from 'tap';
 
-import {
-  compositeFrom,
-  exposeDependency,
-  input,
-  withPropertiesFromObject,
-} from '#composite';
+import {compositeFrom, input} from '#composite';
+import {exposeDependency} from '#composite/control-flow';
+import {withPropertiesFromObject} from '#composite/data';
 
 const composite = compositeFrom({
   compose: false,
diff --git a/test/unit/data/composite/common-utilities/withPropertyFromObject.js b/test/unit/data/composite/data/withPropertyFromObject.js
index 11487226..6a772c36 100644
--- a/test/unit/data/composite/common-utilities/withPropertyFromObject.js
+++ b/test/unit/data/composite/data/withPropertyFromObject.js
@@ -1,11 +1,8 @@
 import t from 'tap';
 
-import {
-  compositeFrom,
-  exposeDependency,
-  input,
-  withPropertyFromObject,
-} from '#composite';
+import {compositeFrom, input} from '#composite';
+import {exposeDependency} from '#composite/control-flow';
+import {withPropertyFromObject} from '#composite/data';
 
 t.test(`withPropertyFromObject: basic behavior`, t => {
   t.plan(4);