diff --git a/.changeset/dry-rocks-sleep.md b/.changeset/dry-rocks-sleep.md
new file mode 100644
index 0000000000..c3c96a1189
--- /dev/null
+++ b/.changeset/dry-rocks-sleep.md
@@ -0,0 +1,9 @@
+---
+"@effect/schema": patch
+---
+
+remove non-tree-shakable compiler dependencies from the Schema module:
+
+- remove dependency from `Arbitrary` compiler
+- remove dependency from `Equivalence` compiler
+- remove dependency from `Pretty` compiler
diff --git a/packages/schema/src/Pretty.ts b/packages/schema/src/Pretty.ts
index 90e92ced61..a87ac878f1 100644
--- a/packages/schema/src/Pretty.ts
+++ b/packages/schema/src/Pretty.ts
@@ -156,7 +156,7 @@ export const match: AST.Match<Pretty<any>> = {
           continue
         }
         output.push(
-          `${getPrettyPropertyKey(name)}: ${propertySignaturesTypes[i](input[name])}`
+          `${util_.formatPropertyKey(name)}: ${propertySignaturesTypes[i](input[name])}`
         )
       }
       // ---------------------------------------------
@@ -170,7 +170,7 @@ export const match: AST.Match<Pretty<any>> = {
             if (Object.prototype.hasOwnProperty.call(expectedKeys, key)) {
               continue
             }
-            output.push(`${getPrettyPropertyKey(key)}: ${type(input[key])}`)
+            output.push(`${util_.formatPropertyKey(key)}: ${type(input[key])}`)
           }
         }
       }
@@ -213,6 +213,3 @@ export const match: AST.Match<Pretty<any>> = {
 }
 
 const compile = AST.getCompiler(match)
-
-const getPrettyPropertyKey = (name: PropertyKey): string =>
-  typeof name === "string" ? JSON.stringify(name) : String(name)
diff --git a/packages/schema/src/Schema.ts b/packages/schema/src/Schema.ts
index 1e7955d97e..dbff46fe9d 100644
--- a/packages/schema/src/Schema.ts
+++ b/packages/schema/src/Schema.ts
@@ -39,6 +39,7 @@ import * as arbitrary_ from "./Arbitrary.js"
 import type { ParseOptions } from "./AST.js"
 import * as AST from "./AST.js"
 import * as equivalence_ from "./Equivalence.js"
+import type * as fastCheck_ from "./FastCheck.js"
 import * as errors_ from "./internal/errors.js"
 import * as filters_ from "./internal/filters.js"
 import * as serializable_ from "./internal/serializable.js"
@@ -5049,10 +5050,11 @@ const optionEncoded = <A, I, R>(value: Schema<A, I, R>) =>
 const optionDecode = <A>(input: OptionEncoded<A>): option_.Option<A> =>
   input._tag === "None" ? option_.none() : option_.some(input.value)
 
-const optionArbitrary = <A>(value: LazyArbitrary<A>): LazyArbitrary<option_.Option<A>> => {
-  const arb = arbitrary_.makeLazy(optionEncoded(schemaFromArbitrary(value)))
-  return (fc) => arb(fc).map(optionDecode)
-}
+const optionArbitrary = <A>(value: LazyArbitrary<A>): LazyArbitrary<option_.Option<A>> => (fc) =>
+  fc.oneof(
+    fc.record({ _tag: fc.constant("None" as const) }),
+    fc.record({ _tag: fc.constant("Some" as const), value: value(fc) })
+  ).map(optionDecode)
 
 const optionPretty = <A>(value: pretty_.Pretty<A>): pretty_.Pretty<option_.Option<A>> =>
   option_.match({
@@ -5277,10 +5279,12 @@ const eitherDecode = <R, L>(input: EitherEncoded<R, L>): either_.Either<R, L> =>
 const eitherArbitrary = <R, L>(
   right: LazyArbitrary<R>,
   left: LazyArbitrary<L>
-): LazyArbitrary<either_.Either<R, L>> => {
-  const arb = arbitrary_.makeLazy(eitherEncoded(schemaFromArbitrary(right), schemaFromArbitrary(left)))
-  return (fc) => arb(fc).map(eitherDecode)
-}
+): LazyArbitrary<either_.Either<R, L>> =>
+(fc) =>
+  fc.oneof(
+    fc.record({ _tag: fc.constant("Left" as const), left: left(fc) }),
+    fc.record({ _tag: fc.constant("Right" as const), right: right(fc) })
+  ).map(eitherDecode)
 
 const eitherPretty = <R, L>(
   right: pretty_.Pretty<R>,
@@ -6374,14 +6378,13 @@ export const TaggedError = <Self = never>(identifier?: string) =>
     tag: { _tag: tag },
     annotations,
     toStringOverride(self) {
-      if (!(Predicate.isString(self.message) && self.message.length > 0)) {
-        return pretty_.make(self.constructor as any)(self)
-      }
-      let message = `${self._tag}: ${self.message}`
-      if (Predicate.isString(self.stack)) {
-        message = `${message}\n${self.stack.split("\n").slice(1).join("\n")}`
+      if ((Predicate.isString(self.message) && self.message.length > 0)) {
+        let message = `${self._tag}: ${self.message}`
+        if (Predicate.isString(self.stack)) {
+          message = `${message}\n${self.stack.split("\n").slice(1).join("\n")}`
+        }
+        return message
       }
-      return message
     }
   })
 }
@@ -6481,7 +6484,7 @@ const makeClass = ({ Base, annotations, fields, fromSchema, identifier, kind, ta
   fromSchema?: Schema.Any | undefined
   tag?: { _tag: AST.LiteralValue } | undefined
   annotations?: Annotations.Schema<any> | undefined
-  toStringOverride?: ((self: any) => string) | undefined
+  toStringOverride?: (self: any) => string | undefined
 }): any => {
   const classSymbol = Symbol.for(`@effect/schema/${kind}/${identifier}`)
   const schema = fromSchema ?? Struct(fields)
@@ -6524,7 +6527,16 @@ const makeClass = ({ Base, annotations, fields, fromSchema, identifier, kind, ta
     }
 
     toString() {
-      return toStringOverride !== undefined ? toStringOverride(this) : pretty_.make(this.constructor as any)(this)
+      if (toStringOverride !== undefined) {
+        const out = toStringOverride(this)
+        if (out !== undefined) {
+          return out
+        }
+      }
+      return `${identifier}({ ${
+        util_.ownKeys(fields).map((p: any) => `${util_.formatPropertyKey(p)}: ${util_.formatUnknown(this[p])}`)
+          .join(", ")
+      } })`
     }
 
     static fields = { ...fields }
@@ -6536,11 +6548,8 @@ const makeClass = ({ Base, annotations, fields, fromSchema, identifier, kind, ta
       const guard = ParseResult.is(toSchema)
       const fallbackInstanceOf = (u: unknown) => Predicate.hasProperty(u, classSymbol) && guard(u)
       const encode = ParseResult.encodeUnknown(toSchema)
-      const pretty = pretty_.make(toSchema)
-      const arb = arbitrary_.makeLazy(toSchema)
-      const equivalence = equivalence_.make(toSchema)
       const declaration: Schema.Any = declare(
-        [],
+        [toSchema],
         {
           decode: () => (input, _, ast) =>
             input instanceof this || fallbackInstanceOf(input)
@@ -6558,9 +6567,9 @@ const makeClass = ({ Base, annotations, fields, fromSchema, identifier, kind, ta
           identifier,
           title: identifier,
           description: `an instance of ${identifier}`,
-          pretty: () => (self: any) => `${identifier}(${pretty(self)})`,
-          arbitrary: () => (fc: any) => arb(fc).map((props: any) => new this(props)),
-          equivalence: () => equivalence as any,
+          pretty: (pretty) => (self: any) => `${identifier}(${pretty(self)})`,
+          arbitrary: (arb) => (fc: any) => arb(fc).map((props: any) => new this(props)),
+          equivalence: identity,
           [AST.SurrogateAnnotationId]: toSchema.ast,
           ...annotations
         }
@@ -6646,37 +6655,41 @@ export type FiberIdEncoded =
     readonly startTimeMillis: number
   }
 
-const FiberIdCompositeEncoded = Struct({
-  _tag: Literal("Composite"),
-  left: suspend(() => FiberIdEncoded),
-  right: suspend(() => FiberIdEncoded)
-}).annotations({ identifier: "FiberIdCompositeEncoded" })
-
 const FiberIdNoneEncoded = Struct({
   _tag: Literal("None")
 }).annotations({ identifier: "FiberIdNoneEncoded" })
 
 const FiberIdRuntimeEncoded = Struct({
   _tag: Literal("Runtime"),
-  id: Int.pipe(nonNegative({
+  id: Int.annotations({
     title: "id",
     description: "id"
-  })),
-  startTimeMillis: Int.pipe(nonNegative({
+  }),
+  startTimeMillis: Int.annotations({
     title: "startTimeMillis",
     description: "startTimeMillis"
-  }))
+  })
 }).annotations({ identifier: "FiberIdRuntimeEncoded" })
 
+const FiberIdCompositeEncoded = Struct({
+  _tag: Literal("Composite"),
+  left: suspend(() => FiberIdEncoded),
+  right: suspend(() => FiberIdEncoded)
+}).annotations({ identifier: "FiberIdCompositeEncoded" })
+
 const FiberIdEncoded: Schema<FiberIdEncoded> = Union(
   FiberIdNoneEncoded,
   FiberIdRuntimeEncoded,
   FiberIdCompositeEncoded
 ).annotations({ identifier: "FiberIdEncoded" })
 
-const fiberIdFromArbitrary = arbitrary_.makeLazy(FiberIdEncoded)
-
-const fiberIdArbitrary: LazyArbitrary<fiberId_.FiberId> = (fc) => fiberIdFromArbitrary(fc).map(fiberIdDecode)
+const fiberIdArbitrary: LazyArbitrary<fiberId_.FiberId> = (fc) =>
+  fc.letrec((tie) => ({
+    None: fc.record({ _tag: fc.constant("None" as const) }),
+    Runtime: fc.record({ _tag: fc.constant("Runtime" as const), id: fc.integer(), startTimeMillis: fc.integer() }),
+    Composite: fc.record({ _tag: fc.constant("Composite" as const), left: tie("FiberId"), right: tie("FiberId") }),
+    FiberId: fc.oneof(tie("None"), tie("Runtime"), tie("Composite")) as any as fastCheck_.Arbitrary<fiberId_.FiberId>
+  })).FiberId.map(fiberIdDecode)
 
 const fiberIdPretty: pretty_.Pretty<fiberId_.FiberId> = (fiberId) => {
   switch (fiberId._tag) {
@@ -6835,10 +6848,24 @@ const causeEncoded = <E, EI, R1, R2>(
 const causeArbitrary = <E>(
   error: LazyArbitrary<E>,
   defect: LazyArbitrary<unknown>
-): LazyArbitrary<cause_.Cause<E>> => {
-  const arb = arbitrary_.makeLazy(causeEncoded(schemaFromArbitrary(error), schemaFromArbitrary(defect)))
-  return (fc) => arb(fc).map(causeDecode)
-}
+): LazyArbitrary<cause_.Cause<E>> =>
+(fc) =>
+  fc.letrec((tie) => ({
+    Empty: fc.record({ _tag: fc.constant("Empty" as const) }),
+    Fail: fc.record({ _tag: fc.constant("Fail" as const), error: error(fc) }),
+    Die: fc.record({ _tag: fc.constant("Die" as const), defect: defect(fc) }),
+    Interrupt: fc.record({ _tag: fc.constant("Interrupt" as const), fiberId: fiberIdArbitrary(fc) }),
+    Sequential: fc.record({ _tag: fc.constant("Sequential" as const), left: tie("Cause"), right: tie("Cause") }),
+    Parallel: fc.record({ _tag: fc.constant("Parallel" as const), left: tie("Cause"), right: tie("Cause") }),
+    Cause: fc.oneof(
+      tie("Empty"),
+      tie("Fail"),
+      tie("Die"),
+      tie("Interrupt"),
+      tie("Sequential"),
+      tie("Parallel")
+    ) as any as fastCheck_.Arbitrary<cause_.Cause<E>>
+  })).Cause.map(causeDecode)
 
 const causePretty = <E>(error: pretty_.Pretty<E>): pretty_.Pretty<cause_.Cause<E>> => (cause) => {
   const f = (cause: cause_.Cause<E>): string => {
@@ -7061,12 +7088,12 @@ const exitArbitrary = <A, E>(
   value: LazyArbitrary<A>,
   error: LazyArbitrary<E>,
   defect: LazyArbitrary<unknown>
-): LazyArbitrary<exit_.Exit<A, E>> => {
-  const arb = arbitrary_.makeLazy(
-    exitEncoded(schemaFromArbitrary(value), schemaFromArbitrary(error), schemaFromArbitrary(defect))
-  )
-  return (fc) => arb(fc).map(exitDecode)
-}
+): LazyArbitrary<exit_.Exit<A, E>> =>
+(fc) =>
+  fc.oneof(
+    fc.record({ _tag: fc.constant("Failure" as const), cause: causeArbitrary(error, defect)(fc) }),
+    fc.record({ _tag: fc.constant("Success" as const), value: value(fc) })
+  ).map(exitDecode)
 
 const exitPretty =
   <A, E>(value: pretty_.Pretty<A>, error: pretty_.Pretty<E>): pretty_.Pretty<exit_.Exit<A, E>> => (exit) =>
@@ -7525,11 +7552,6 @@ export const SortedSet = <Value extends Schema.Any>(
   )
 }
 
-const schemaFromArbitrary = <A>(value: LazyArbitrary<A>): Schema<A> =>
-  suspend<A, A, never>(() => Any).annotations({
-    [arbitrary_.ArbitraryHookId]: () => value
-  })
-
 /**
  * @category api interface
  * @since 1.0.0
diff --git a/packages/schema/src/internal/util.ts b/packages/schema/src/internal/util.ts
index 4b13604d14..4bc93b66b8 100644
--- a/packages/schema/src/internal/util.ts
+++ b/packages/schema/src/internal/util.ts
@@ -72,3 +72,7 @@ export const formatUnknown = (u: unknown): string => {
     return String(u)
   }
 }
+
+/** @internal */
+export const formatPropertyKey = (name: PropertyKey): string =>
+  typeof name === "string" ? JSON.stringify(name) : String(name)
diff --git a/packages/schema/test/AST/suspend.test.ts b/packages/schema/test/AST/suspend.test.ts
index b8ab46aebb..41ea11f9d9 100644
--- a/packages/schema/test/AST/suspend.test.ts
+++ b/packages/schema/test/AST/suspend.test.ts
@@ -1,6 +1,6 @@
 import type * as AST from "@effect/schema/AST"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("AST.Suspend", () => {
diff --git a/packages/schema/test/Arbitrary/Arbitrary.test.ts b/packages/schema/test/Arbitrary/Arbitrary.test.ts
index 12e1bf31cc..cdab2c0309 100644
--- a/packages/schema/test/Arbitrary/Arbitrary.test.ts
+++ b/packages/schema/test/Arbitrary/Arbitrary.test.ts
@@ -1,6 +1,6 @@
 import * as Arbitrary from "@effect/schema/Arbitrary"
 import * as S from "@effect/schema/Schema"
-import { expectValidArbitrary } from "@effect/schema/test/util"
+import { expectValidArbitrary } from "@effect/schema/test/TestUtils"
 import { isUnknown } from "effect/Predicate"
 import * as fc from "fast-check"
 import { describe, expect, it } from "vitest"
diff --git a/packages/schema/test/Arbitrary/Class.test.ts b/packages/schema/test/Arbitrary/Class.test.ts
index c024f906f4..7fbb5f5f03 100644
--- a/packages/schema/test/Arbitrary/Class.test.ts
+++ b/packages/schema/test/Arbitrary/Class.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import { expectValidArbitrary } from "@effect/schema/test/util"
+import { expectValidArbitrary } from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("class", () => {
diff --git a/packages/schema/test/ArrayFormatter.test.ts b/packages/schema/test/ArrayFormatter.test.ts
index 8e7023c02b..564f8a6c48 100644
--- a/packages/schema/test/ArrayFormatter.test.ts
+++ b/packages/schema/test/ArrayFormatter.test.ts
@@ -2,7 +2,7 @@ import * as ArrayFormatter from "@effect/schema/ArrayFormatter"
 import type { ParseOptions } from "@effect/schema/AST"
 import * as ParseResult from "@effect/schema/ParseResult"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as Either from "effect/Either"
 import * as Option from "effect/Option"
 import { describe, expect, it } from "vitest"
diff --git a/packages/schema/test/Schema/Any/Any.test.ts b/packages/schema/test/Schema/Any/Any.test.ts
index 3107ab8320..fa5dcb4891 100644
--- a/packages/schema/test/Schema/Any/Any.test.ts
+++ b/packages/schema/test/Schema/Any/Any.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Any", () => {
diff --git a/packages/schema/test/Schema/Array/head.test.ts b/packages/schema/test/Schema/Array/head.test.ts
index 5246cd8c72..00f867e401 100644
--- a/packages/schema/test/Schema/Array/head.test.ts
+++ b/packages/schema/test/Schema/Array/head.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as Option from "effect/Option"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Array/headOrElse.test.ts b/packages/schema/test/Schema/Array/headOrElse.test.ts
index ce36e7a3ea..ed5274808a 100644
--- a/packages/schema/test/Schema/Array/headOrElse.test.ts
+++ b/packages/schema/test/Schema/Array/headOrElse.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("headOrElse", () => {
diff --git a/packages/schema/test/Schema/Array/itemsCount.test.ts b/packages/schema/test/Schema/Array/itemsCount.test.ts
index a448153d8d..650bc8acff 100644
--- a/packages/schema/test/Schema/Array/itemsCount.test.ts
+++ b/packages/schema/test/Schema/Array/itemsCount.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("itemsCount", () => {
diff --git a/packages/schema/test/Schema/Array/maxItems.test.ts b/packages/schema/test/Schema/Array/maxItems.test.ts
index 6615340225..b803cf8168 100644
--- a/packages/schema/test/Schema/Array/maxItems.test.ts
+++ b/packages/schema/test/Schema/Array/maxItems.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("maxItems", () => {
diff --git a/packages/schema/test/Schema/Array/minItems.test.ts b/packages/schema/test/Schema/Array/minItems.test.ts
index eed90f287b..47cbe81da7 100644
--- a/packages/schema/test/Schema/Array/minItems.test.ts
+++ b/packages/schema/test/Schema/Array/minItems.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("minItems", () => {
diff --git a/packages/schema/test/Schema/BigDecimal/BigDecimal.test.ts b/packages/schema/test/Schema/BigDecimal/BigDecimal.test.ts
index 927c7f9c17..2adb7be3a5 100644
--- a/packages/schema/test/Schema/BigDecimal/BigDecimal.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/BigDecimal.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigDecimal/BigDecimalFromNumber.test.ts b/packages/schema/test/Schema/BigDecimal/BigDecimalFromNumber.test.ts
index a586006080..f3ddb580c0 100644
--- a/packages/schema/test/Schema/BigDecimal/BigDecimalFromNumber.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/BigDecimalFromNumber.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigDecimal/BigDecimalFromSelf.test.ts b/packages/schema/test/Schema/BigDecimal/BigDecimalFromSelf.test.ts
index 201a370e67..a30d0a2bf0 100644
--- a/packages/schema/test/Schema/BigDecimal/BigDecimalFromSelf.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/BigDecimalFromSelf.test.ts
@@ -1,7 +1,7 @@
 import * as Equivalence from "@effect/schema/Equivalence"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigDecimal/NegativeBigDecimalFromSelf.test.ts b/packages/schema/test/Schema/BigDecimal/NegativeBigDecimalFromSelf.test.ts
index a829a83002..1511b9c164 100644
--- a/packages/schema/test/Schema/BigDecimal/NegativeBigDecimalFromSelf.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/NegativeBigDecimalFromSelf.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigDecimal/NonNegativeBigDecimalFromSelf.test.ts b/packages/schema/test/Schema/BigDecimal/NonNegativeBigDecimalFromSelf.test.ts
index 665bc66943..cca734181f 100644
--- a/packages/schema/test/Schema/BigDecimal/NonNegativeBigDecimalFromSelf.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/NonNegativeBigDecimalFromSelf.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigDecimal/NonPositiveBigDecimalFromSelf.test.ts b/packages/schema/test/Schema/BigDecimal/NonPositiveBigDecimalFromSelf.test.ts
index 853ccaed49..142b64350d 100644
--- a/packages/schema/test/Schema/BigDecimal/NonPositiveBigDecimalFromSelf.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/NonPositiveBigDecimalFromSelf.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigDecimal/PositiveBigDecimalFromSelf.test.ts b/packages/schema/test/Schema/BigDecimal/PositiveBigDecimalFromSelf.test.ts
index cde54ae4e8..81bc1343f4 100644
--- a/packages/schema/test/Schema/BigDecimal/PositiveBigDecimalFromSelf.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/PositiveBigDecimalFromSelf.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigDecimal/betweenBigDecimal.test.ts b/packages/schema/test/Schema/BigDecimal/betweenBigDecimal.test.ts
index 62d74018f1..f07773e513 100644
--- a/packages/schema/test/Schema/BigDecimal/betweenBigDecimal.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/betweenBigDecimal.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigDecimal/clampBigDecimal.test.ts b/packages/schema/test/Schema/BigDecimal/clampBigDecimal.test.ts
index 488d859d2c..b581a16c17 100644
--- a/packages/schema/test/Schema/BigDecimal/clampBigDecimal.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/clampBigDecimal.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigDecimal/greaterThanBigDecimal.test.ts b/packages/schema/test/Schema/BigDecimal/greaterThanBigDecimal.test.ts
index 3ffbba6b7f..b5e1135907 100644
--- a/packages/schema/test/Schema/BigDecimal/greaterThanBigDecimal.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/greaterThanBigDecimal.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigDecimal/greaterThanOrEqualToBigDecimal.test.ts b/packages/schema/test/Schema/BigDecimal/greaterThanOrEqualToBigDecimal.test.ts
index 25ae02e57d..70be1ea007 100644
--- a/packages/schema/test/Schema/BigDecimal/greaterThanOrEqualToBigDecimal.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/greaterThanOrEqualToBigDecimal.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigDecimal/lessThanBigDecimal.test.ts b/packages/schema/test/Schema/BigDecimal/lessThanBigDecimal.test.ts
index 07509b48b1..b08eb5a1ad 100644
--- a/packages/schema/test/Schema/BigDecimal/lessThanBigDecimal.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/lessThanBigDecimal.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigDecimal/lessThanOrEqualToBigDecimal.test.ts b/packages/schema/test/Schema/BigDecimal/lessThanOrEqualToBigDecimal.test.ts
index 5d0a25218b..4b5f147c75 100644
--- a/packages/schema/test/Schema/BigDecimal/lessThanOrEqualToBigDecimal.test.ts
+++ b/packages/schema/test/Schema/BigDecimal/lessThanOrEqualToBigDecimal.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { BigDecimal } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/BigInt/BigInt.test.ts b/packages/schema/test/Schema/BigInt/BigInt.test.ts
index 42a4c471c8..e2b4f8555f 100644
--- a/packages/schema/test/Schema/BigInt/BigInt.test.ts
+++ b/packages/schema/test/Schema/BigInt/BigInt.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("BigInt", () => {
diff --git a/packages/schema/test/Schema/BigInt/BigIntFromNumber.test.ts b/packages/schema/test/Schema/BigInt/BigIntFromNumber.test.ts
index 962ce37301..423d27c790 100644
--- a/packages/schema/test/Schema/BigInt/BigIntFromNumber.test.ts
+++ b/packages/schema/test/Schema/BigInt/BigIntFromNumber.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("BigIntFromNumber", () => {
diff --git a/packages/schema/test/Schema/BigInt/BigIntFromSelf.test.ts b/packages/schema/test/Schema/BigInt/BigIntFromSelf.test.ts
index fa018a3a04..03bb5873e3 100644
--- a/packages/schema/test/Schema/BigInt/BigIntFromSelf.test.ts
+++ b/packages/schema/test/Schema/BigInt/BigIntFromSelf.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("BigIntFromSelf", () => {
diff --git a/packages/schema/test/Schema/BigInt/NegativeBigIntFromSelf.test.ts b/packages/schema/test/Schema/BigInt/NegativeBigIntFromSelf.test.ts
index df3a58e0e3..ad9088632d 100644
--- a/packages/schema/test/Schema/BigInt/NegativeBigIntFromSelf.test.ts
+++ b/packages/schema/test/Schema/BigInt/NegativeBigIntFromSelf.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("NegativeBigIntFromSelf", () => {
diff --git a/packages/schema/test/Schema/BigInt/NonNegativeBigIntFromSelf.test.ts b/packages/schema/test/Schema/BigInt/NonNegativeBigIntFromSelf.test.ts
index 3a2cfa0b17..11bd1840ad 100644
--- a/packages/schema/test/Schema/BigInt/NonNegativeBigIntFromSelf.test.ts
+++ b/packages/schema/test/Schema/BigInt/NonNegativeBigIntFromSelf.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("NonNegativeBigIntFromSelf", () => {
diff --git a/packages/schema/test/Schema/BigInt/NonPositiveBigIntFromSelf.test.ts b/packages/schema/test/Schema/BigInt/NonPositiveBigIntFromSelf.test.ts
index 48c2df657d..902a5bb926 100644
--- a/packages/schema/test/Schema/BigInt/NonPositiveBigIntFromSelf.test.ts
+++ b/packages/schema/test/Schema/BigInt/NonPositiveBigIntFromSelf.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("NonPositiveBigIntFromSelf", () => {
diff --git a/packages/schema/test/Schema/BigInt/PositiveBigIntFromSelf.test.ts b/packages/schema/test/Schema/BigInt/PositiveBigIntFromSelf.test.ts
index e36a38ca44..a6ffe06802 100644
--- a/packages/schema/test/Schema/BigInt/PositiveBigIntFromSelf.test.ts
+++ b/packages/schema/test/Schema/BigInt/PositiveBigIntFromSelf.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("PositiveBigIntFromSelf", () => {
diff --git a/packages/schema/test/Schema/BigInt/betweenBigInt.test.ts b/packages/schema/test/Schema/BigInt/betweenBigInt.test.ts
index bc2eda6547..47bc240965 100644
--- a/packages/schema/test/Schema/BigInt/betweenBigInt.test.ts
+++ b/packages/schema/test/Schema/BigInt/betweenBigInt.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("betweenBigInt", () => {
diff --git a/packages/schema/test/Schema/BigInt/clampBigInt.test.ts b/packages/schema/test/Schema/BigInt/clampBigInt.test.ts
index e81aa47aa6..81bf61e7c7 100644
--- a/packages/schema/test/Schema/BigInt/clampBigInt.test.ts
+++ b/packages/schema/test/Schema/BigInt/clampBigInt.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("clampBigInt", () => {
diff --git a/packages/schema/test/Schema/BigInt/greaterThanBigInt.test.ts b/packages/schema/test/Schema/BigInt/greaterThanBigInt.test.ts
index 740ad4919a..8253809b61 100644
--- a/packages/schema/test/Schema/BigInt/greaterThanBigInt.test.ts
+++ b/packages/schema/test/Schema/BigInt/greaterThanBigInt.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("greaterThanBigInt", () => {
diff --git a/packages/schema/test/Schema/BigInt/greaterThanOrEqualToBigInt.test.ts b/packages/schema/test/Schema/BigInt/greaterThanOrEqualToBigInt.test.ts
index 8e3f716610..6e0ee92197 100644
--- a/packages/schema/test/Schema/BigInt/greaterThanOrEqualToBigInt.test.ts
+++ b/packages/schema/test/Schema/BigInt/greaterThanOrEqualToBigInt.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("greaterThanOrEqualToBigInt", () => {
diff --git a/packages/schema/test/Schema/BigInt/lessThanBigInt.test.ts b/packages/schema/test/Schema/BigInt/lessThanBigInt.test.ts
index 4eecdf0f32..1533c17f31 100644
--- a/packages/schema/test/Schema/BigInt/lessThanBigInt.test.ts
+++ b/packages/schema/test/Schema/BigInt/lessThanBigInt.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("lessThanBigInt", () => {
diff --git a/packages/schema/test/Schema/BigInt/lessThanOrEqualToBigInt.test.ts b/packages/schema/test/Schema/BigInt/lessThanOrEqualToBigInt.test.ts
index dfca34b05a..2e5c410eb7 100644
--- a/packages/schema/test/Schema/BigInt/lessThanOrEqualToBigInt.test.ts
+++ b/packages/schema/test/Schema/BigInt/lessThanOrEqualToBigInt.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("lessThanOrEqualToBigInt", () => {
diff --git a/packages/schema/test/Schema/Boolean/Boolean.test.ts b/packages/schema/test/Schema/Boolean/Boolean.test.ts
index 53c11abf3f..7574131421 100644
--- a/packages/schema/test/Schema/Boolean/Boolean.test.ts
+++ b/packages/schema/test/Schema/Boolean/Boolean.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Boolean", () => {
diff --git a/packages/schema/test/Schema/Boolean/BooleanFromUnknown.test.ts b/packages/schema/test/Schema/Boolean/BooleanFromUnknown.test.ts
index 7eb4fbf0db..e3a1294156 100644
--- a/packages/schema/test/Schema/Boolean/BooleanFromUnknown.test.ts
+++ b/packages/schema/test/Schema/Boolean/BooleanFromUnknown.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("BooleanFromUnknown", () => {
diff --git a/packages/schema/test/Schema/Boolean/Not.test.ts b/packages/schema/test/Schema/Boolean/Not.test.ts
index 284f2c9318..87300e914a 100644
--- a/packages/schema/test/Schema/Boolean/Not.test.ts
+++ b/packages/schema/test/Schema/Boolean/Not.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Not", () => {
diff --git a/packages/schema/test/Schema/Cause/Cause.test.ts b/packages/schema/test/Schema/Cause/Cause.test.ts
index 56d2eb4cc4..6f19b98f4f 100644
--- a/packages/schema/test/Schema/Cause/Cause.test.ts
+++ b/packages/schema/test/Schema/Cause/Cause.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Cause, FiberId } from "effect"
 import { assert, describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Cause/CauseFromSelf.test.ts b/packages/schema/test/Schema/Cause/CauseFromSelf.test.ts
index 51d6ae9068..ac8e72460f 100644
--- a/packages/schema/test/Schema/Cause/CauseFromSelf.test.ts
+++ b/packages/schema/test/Schema/Cause/CauseFromSelf.test.ts
@@ -1,11 +1,15 @@
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as Cause from "effect/Cause"
 import * as FiberId from "effect/FiberId"
 import { describe, expect, it } from "vitest"
 
 describe("CauseFromSelf", () => {
+  it("arbitrary", () => {
+    Util.expectArbitrary(S.CauseFromSelf({ error: S.NumberFromString }))
+  })
+
   it("property tests", () => {
     Util.roundtrip(S.CauseFromSelf({ error: S.NumberFromString }))
   })
diff --git a/packages/schema/test/Schema/Chunk/Chunk.test.ts b/packages/schema/test/Schema/Chunk/Chunk.test.ts
index c268ca8899..543e8951af 100644
--- a/packages/schema/test/Schema/Chunk/Chunk.test.ts
+++ b/packages/schema/test/Schema/Chunk/Chunk.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as C from "effect/Chunk"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Chunk/ChunkFromSelf.test.ts b/packages/schema/test/Schema/Chunk/ChunkFromSelf.test.ts
index beab05e2a9..2b470ec48d 100644
--- a/packages/schema/test/Schema/Chunk/ChunkFromSelf.test.ts
+++ b/packages/schema/test/Schema/Chunk/ChunkFromSelf.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as C from "effect/Chunk"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Class/Class.test.ts b/packages/schema/test/Schema/Class/Class.test.ts
index 663a89a3e9..858823fba2 100644
--- a/packages/schema/test/Schema/Class/Class.test.ts
+++ b/packages/schema/test/Schema/Class/Class.test.ts
@@ -4,7 +4,7 @@ import * as ParseResult from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
 import * as Serializable from "@effect/schema/Serializable"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Context, Effect, Exit, pipe, Struct } from "effect"
 import * as Data from "effect/Data"
 import * as Equal from "effect/Equal"
@@ -219,6 +219,12 @@ describe("Class APIs", () => {
       expect(schema.ast.annotations[AST.TitleAnnotationId]).toEqual("X")
     })
 
+    it("default toString()", () => {
+      const b = Symbol.for("b")
+      class A extends S.Class<A>("A")({ a: S.String, [b]: S.Number }) {}
+      expect(String(new A({ a: "a", [b]: 1 }))).toBe(`A({ "a": "a", Symbol(b): 1 })`)
+    })
+
     it("decoding", async () => {
       class A extends S.Class<A>("A")({ a: S.NonEmpty }) {}
       await Util.expectDecodeUnknownSuccess(A, { a: "a" }, new A({ a: "a" }))
@@ -502,7 +508,7 @@ describe("Class APIs", () => {
     const personAge = new PersonWithAge({ id: 1, name: "John", age: 30 })
 
     expect(String(person)).toEqual(`Person({ "id": 1, "name": "John" })`)
-    expect(String(personAge)).toEqual(`PersonWithAge({ "id": 1, "age": 30, "name": "John" })`)
+    expect(String(personAge)).toEqual(`PersonWithAge({ "id": 1, "name": "John", "age": 30 })`)
 
     expect(person instanceof Data.Class).toEqual(true)
     expect(personAge instanceof Data.Class).toEqual(true)
@@ -611,7 +617,7 @@ describe("Class APIs", () => {
     let person = new TaggedPersonWithAge({ id: 1, name: "John", age: 30 })
 
     expect(String(person)).toEqual(
-      `TaggedPersonWithAge({ "_tag": "TaggedPerson", "id": 1, "age": 30, "name": "John" })`
+      `TaggedPersonWithAge({ "_tag": "TaggedPerson", "id": 1, "name": "John", "age": 30 })`
     )
     expect(person._tag).toEqual("TaggedPerson")
     expect(person.upperName).toEqual("JOHN")
@@ -864,6 +870,11 @@ describe("Class APIs", () => {
     })
   })
 
+  it("arbitrary", () => {
+    class A extends S.Class<A>("A")({ a: S.String }) {}
+    Util.expectArbitrary(A)
+  })
+
   it("equivalence", () => {
     class A extends S.TaggedClass<A>()("A", {
       a: S.String
diff --git a/packages/schema/test/Schema/Data/Data.test.ts b/packages/schema/test/Schema/Data/Data.test.ts
index 331575a122..76c74d6904 100644
--- a/packages/schema/test/Schema/Data/Data.test.ts
+++ b/packages/schema/test/Schema/Data/Data.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as Data from "effect/Data"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Data/DataFromSelf.test.ts b/packages/schema/test/Schema/Data/DataFromSelf.test.ts
index 27c397f56d..2f5a3834b1 100644
--- a/packages/schema/test/Schema/Data/DataFromSelf.test.ts
+++ b/packages/schema/test/Schema/Data/DataFromSelf.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as Data from "effect/Data"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Date/Date.test.ts b/packages/schema/test/Schema/Date/Date.test.ts
index 1494f2ee8b..39967cd483 100644
--- a/packages/schema/test/Schema/Date/Date.test.ts
+++ b/packages/schema/test/Schema/Date/Date.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Date", () => {
diff --git a/packages/schema/test/Schema/Date/DateFromSelf.test.ts b/packages/schema/test/Schema/Date/DateFromSelf.test.ts
index 2b1ee52eeb..e1842882be 100644
--- a/packages/schema/test/Schema/Date/DateFromSelf.test.ts
+++ b/packages/schema/test/Schema/Date/DateFromSelf.test.ts
@@ -1,6 +1,6 @@
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("DateFromSelf", () => {
diff --git a/packages/schema/test/Schema/Duration/Duration.test.ts b/packages/schema/test/Schema/Duration/Duration.test.ts
index db5b507f96..d84bb6f8b7 100644
--- a/packages/schema/test/Schema/Duration/Duration.test.ts
+++ b/packages/schema/test/Schema/Duration/Duration.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Duration } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Duration/DurationFromMillis.test.ts b/packages/schema/test/Schema/Duration/DurationFromMillis.test.ts
index 0246c6ad6b..d68eb56933 100644
--- a/packages/schema/test/Schema/Duration/DurationFromMillis.test.ts
+++ b/packages/schema/test/Schema/Duration/DurationFromMillis.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Duration } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Duration/DurationFromNanos.test.ts b/packages/schema/test/Schema/Duration/DurationFromNanos.test.ts
index 3bb1797a55..b2fa196020 100644
--- a/packages/schema/test/Schema/Duration/DurationFromNanos.test.ts
+++ b/packages/schema/test/Schema/Duration/DurationFromNanos.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Duration } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Duration/DurationFromSelf.test.ts b/packages/schema/test/Schema/Duration/DurationFromSelf.test.ts
index c7c5c72888..e39fe41286 100644
--- a/packages/schema/test/Schema/Duration/DurationFromSelf.test.ts
+++ b/packages/schema/test/Schema/Duration/DurationFromSelf.test.ts
@@ -1,6 +1,6 @@
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Duration } from "effect"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Duration/betweenDuration.test.ts b/packages/schema/test/Schema/Duration/betweenDuration.test.ts
index 600838e91b..8ee613f33e 100644
--- a/packages/schema/test/Schema/Duration/betweenDuration.test.ts
+++ b/packages/schema/test/Schema/Duration/betweenDuration.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Duration } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Duration/clampDuration.test.ts b/packages/schema/test/Schema/Duration/clampDuration.test.ts
index 3b0e504d22..a87e2e034a 100644
--- a/packages/schema/test/Schema/Duration/clampDuration.test.ts
+++ b/packages/schema/test/Schema/Duration/clampDuration.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Duration } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Duration/greaterThanDuration.test.ts b/packages/schema/test/Schema/Duration/greaterThanDuration.test.ts
index 074f97e405..81ec4844f5 100644
--- a/packages/schema/test/Schema/Duration/greaterThanDuration.test.ts
+++ b/packages/schema/test/Schema/Duration/greaterThanDuration.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Duration } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Duration/greaterThanOrEqualToDuration.test.ts b/packages/schema/test/Schema/Duration/greaterThanOrEqualToDuration.test.ts
index 7243c64cb7..3258c34afd 100644
--- a/packages/schema/test/Schema/Duration/greaterThanOrEqualToDuration.test.ts
+++ b/packages/schema/test/Schema/Duration/greaterThanOrEqualToDuration.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Duration } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Duration/lessThanDuration.test.ts b/packages/schema/test/Schema/Duration/lessThanDuration.test.ts
index 08fa2f1af4..b07825dd57 100644
--- a/packages/schema/test/Schema/Duration/lessThanDuration.test.ts
+++ b/packages/schema/test/Schema/Duration/lessThanDuration.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Duration } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Duration/lessThanOrEqualToDuration.test.ts b/packages/schema/test/Schema/Duration/lessThanOrEqualToDuration.test.ts
index 2765cd90b8..7dcb1c75cc 100644
--- a/packages/schema/test/Schema/Duration/lessThanOrEqualToDuration.test.ts
+++ b/packages/schema/test/Schema/Duration/lessThanOrEqualToDuration.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Duration } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Either/Either.test.ts b/packages/schema/test/Schema/Either/Either.test.ts
index 9989233b39..69bff5ac50 100644
--- a/packages/schema/test/Schema/Either/Either.test.ts
+++ b/packages/schema/test/Schema/Either/Either.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as E from "effect/Either"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Either/EitherFromSelf.test.ts b/packages/schema/test/Schema/Either/EitherFromSelf.test.ts
index 55b82fa150..f03d7f1469 100644
--- a/packages/schema/test/Schema/Either/EitherFromSelf.test.ts
+++ b/packages/schema/test/Schema/Either/EitherFromSelf.test.ts
@@ -1,11 +1,15 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as E from "effect/Either"
 import { describe, expect, it } from "vitest"
 
 describe("EitherFromSelf", () => {
+  it("arbitrary", () => {
+    Util.expectArbitrary(S.EitherFromSelf({ left: S.String, right: S.Number }))
+  })
+
   it("property tests", () => {
     Util.roundtrip(S.EitherFromSelf({ left: S.String, right: S.Number }))
   })
diff --git a/packages/schema/test/Schema/Either/EitherFromUnion.test.ts b/packages/schema/test/Schema/Either/EitherFromUnion.test.ts
index 19ed100cb5..b22c3a0a38 100644
--- a/packages/schema/test/Schema/Either/EitherFromUnion.test.ts
+++ b/packages/schema/test/Schema/Either/EitherFromUnion.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as E from "effect/Either"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Encoding/Base64.test.ts b/packages/schema/test/Schema/Encoding/Base64.test.ts
index ae75dc83bd..d3607c53bb 100644
--- a/packages/schema/test/Schema/Encoding/Base64.test.ts
+++ b/packages/schema/test/Schema/Encoding/Base64.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Base64", () => {
diff --git a/packages/schema/test/Schema/Encoding/Base64Url.test.ts b/packages/schema/test/Schema/Encoding/Base64Url.test.ts
index 750321a046..3da93add97 100644
--- a/packages/schema/test/Schema/Encoding/Base64Url.test.ts
+++ b/packages/schema/test/Schema/Encoding/Base64Url.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Base64Url", () => {
diff --git a/packages/schema/test/Schema/Encoding/Hex.test.ts b/packages/schema/test/Schema/Encoding/Hex.test.ts
index d079ad373a..a2e17ceafa 100644
--- a/packages/schema/test/Schema/Encoding/Hex.test.ts
+++ b/packages/schema/test/Schema/Encoding/Hex.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Hex", () => {
diff --git a/packages/schema/test/Schema/Enums/Enums.test.ts b/packages/schema/test/Schema/Enums/Enums.test.ts
index 585fe62bd0..3a4fc85300 100644
--- a/packages/schema/test/Schema/Enums/Enums.test.ts
+++ b/packages/schema/test/Schema/Enums/Enums.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("Enums", () => {
diff --git a/packages/schema/test/Schema/Exit/Exit.test.ts b/packages/schema/test/Schema/Exit/Exit.test.ts
index 6669776743..81992b81a1 100644
--- a/packages/schema/test/Schema/Exit/Exit.test.ts
+++ b/packages/schema/test/Schema/Exit/Exit.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Exit } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Exit/ExitFromSelf.test.ts b/packages/schema/test/Schema/Exit/ExitFromSelf.test.ts
new file mode 100644
index 0000000000..45be4daf0e
--- /dev/null
+++ b/packages/schema/test/Schema/Exit/ExitFromSelf.test.ts
@@ -0,0 +1,9 @@
+import * as S from "@effect/schema/Schema"
+import * as Util from "@effect/schema/test/TestUtils"
+import { describe, it } from "vitest"
+
+describe("ExitFromSelf", () => {
+  it("arbitrary", () => {
+    Util.expectArbitrary(S.ExitFromSelf({ failure: S.String, success: S.Number }))
+  })
+})
diff --git a/packages/schema/test/Schema/FiberId/FiberId.test.ts b/packages/schema/test/Schema/FiberId/FiberId.test.ts
index 7fef4822dc..480036d24d 100644
--- a/packages/schema/test/Schema/FiberId/FiberId.test.ts
+++ b/packages/schema/test/Schema/FiberId/FiberId.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as FiberId from "effect/FiberId"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/FiberId/FiberIdFromSelf.test.ts b/packages/schema/test/Schema/FiberId/FiberIdFromSelf.test.ts
index 0ddf19db16..2627c9c228 100644
--- a/packages/schema/test/Schema/FiberId/FiberIdFromSelf.test.ts
+++ b/packages/schema/test/Schema/FiberId/FiberIdFromSelf.test.ts
@@ -1,10 +1,14 @@
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as FiberId from "effect/FiberId"
 import { describe, expect, it } from "vitest"
 
 describe("FiberIdFromSelf", () => {
+  it("arbitrary", () => {
+    Util.expectArbitrary(S.FiberIdFromSelf)
+  })
+
   it("property tests", () => {
     Util.roundtrip(S.FiberIdFromSelf)
   })
diff --git a/packages/schema/test/Schema/HashMap/HashMap.test.ts b/packages/schema/test/Schema/HashMap/HashMap.test.ts
index ce7dc5677f..71271c9733 100644
--- a/packages/schema/test/Schema/HashMap/HashMap.test.ts
+++ b/packages/schema/test/Schema/HashMap/HashMap.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as HashMap from "effect/HashMap"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/HashMap/HashMapFromSelf.test.ts b/packages/schema/test/Schema/HashMap/HashMapFromSelf.test.ts
index 30c632ba5c..6637f636a9 100644
--- a/packages/schema/test/Schema/HashMap/HashMapFromSelf.test.ts
+++ b/packages/schema/test/Schema/HashMap/HashMapFromSelf.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as HashMap from "effect/HashMap"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/HashSet/HashSet.test.ts b/packages/schema/test/Schema/HashSet/HashSet.test.ts
index 9452d13b11..f3bbf3dcd5 100644
--- a/packages/schema/test/Schema/HashSet/HashSet.test.ts
+++ b/packages/schema/test/Schema/HashSet/HashSet.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as HashSet from "effect/HashSet"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/HashSet/HashSetFromSelf.test.ts b/packages/schema/test/Schema/HashSet/HashSetFromSelf.test.ts
index 9ac1ab7e99..e13fcbb1d0 100644
--- a/packages/schema/test/Schema/HashSet/HashSetFromSelf.test.ts
+++ b/packages/schema/test/Schema/HashSet/HashSetFromSelf.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as HashSet from "effect/HashSet"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/List/List.test.ts b/packages/schema/test/Schema/List/List.test.ts
index e85e3543af..226b7ada2d 100644
--- a/packages/schema/test/Schema/List/List.test.ts
+++ b/packages/schema/test/Schema/List/List.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as List from "effect/List"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/List/ListFromSelf.test.ts b/packages/schema/test/Schema/List/ListFromSelf.test.ts
index 4355f54935..55deb9107b 100644
--- a/packages/schema/test/Schema/List/ListFromSelf.test.ts
+++ b/packages/schema/test/Schema/List/ListFromSelf.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as List from "effect/List"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Literal/Literal.test.ts b/packages/schema/test/Schema/Literal/Literal.test.ts
index 5e87c3f1b4..c4f870d0d8 100644
--- a/packages/schema/test/Schema/Literal/Literal.test.ts
+++ b/packages/schema/test/Schema/Literal/Literal.test.ts
@@ -1,6 +1,6 @@
 import * as AST from "@effect/schema/AST"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("Literal", () => {
diff --git a/packages/schema/test/Schema/Never/Never.test.ts b/packages/schema/test/Schema/Never/Never.test.ts
index c79d448dbb..4dbc09519f 100644
--- a/packages/schema/test/Schema/Never/Never.test.ts
+++ b/packages/schema/test/Schema/Never/Never.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Never", () => {
diff --git a/packages/schema/test/Schema/Number/JsonNumber.test.ts b/packages/schema/test/Schema/Number/JsonNumber.test.ts
index 5ebbae80a1..c944bdbc1d 100644
--- a/packages/schema/test/Schema/Number/JsonNumber.test.ts
+++ b/packages/schema/test/Schema/Number/JsonNumber.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("JsonNumber", () => {
diff --git a/packages/schema/test/Schema/Number/Number.test.ts b/packages/schema/test/Schema/Number/Number.test.ts
index 79676ad10c..acfd5a5b78 100644
--- a/packages/schema/test/Schema/Number/Number.test.ts
+++ b/packages/schema/test/Schema/Number/Number.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Number", () => {
diff --git a/packages/schema/test/Schema/Number/between.test.ts b/packages/schema/test/Schema/Number/between.test.ts
index 85c0e1698e..54eeb6fb94 100644
--- a/packages/schema/test/Schema/Number/between.test.ts
+++ b/packages/schema/test/Schema/Number/between.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("between", () => {
diff --git a/packages/schema/test/Schema/Number/clamp.test.ts b/packages/schema/test/Schema/Number/clamp.test.ts
index 9ddebaf369..4add28070b 100644
--- a/packages/schema/test/Schema/Number/clamp.test.ts
+++ b/packages/schema/test/Schema/Number/clamp.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("clamp", () => {
diff --git a/packages/schema/test/Schema/Number/finite.test.ts b/packages/schema/test/Schema/Number/finite.test.ts
index fb22de99a1..b225d7ec0e 100644
--- a/packages/schema/test/Schema/Number/finite.test.ts
+++ b/packages/schema/test/Schema/Number/finite.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Finite", () => {
diff --git a/packages/schema/test/Schema/Number/greaterThan.test.ts b/packages/schema/test/Schema/Number/greaterThan.test.ts
index 3e8f249d35..62013e503c 100644
--- a/packages/schema/test/Schema/Number/greaterThan.test.ts
+++ b/packages/schema/test/Schema/Number/greaterThan.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("greaterThan", () => {
diff --git a/packages/schema/test/Schema/Number/greaterThanOrEqualTo.test.ts b/packages/schema/test/Schema/Number/greaterThanOrEqualTo.test.ts
index 561e2372bd..9684c87e71 100644
--- a/packages/schema/test/Schema/Number/greaterThanOrEqualTo.test.ts
+++ b/packages/schema/test/Schema/Number/greaterThanOrEqualTo.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("greaterThanOrEqualTo", () => {
diff --git a/packages/schema/test/Schema/Number/int.test.ts b/packages/schema/test/Schema/Number/int.test.ts
index 4d97e5ec7c..da18d7eeb7 100644
--- a/packages/schema/test/Schema/Number/int.test.ts
+++ b/packages/schema/test/Schema/Number/int.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("Int", () => {
diff --git a/packages/schema/test/Schema/Number/lessThan.test.ts b/packages/schema/test/Schema/Number/lessThan.test.ts
index 80ca6c0c0b..42617cc16c 100644
--- a/packages/schema/test/Schema/Number/lessThan.test.ts
+++ b/packages/schema/test/Schema/Number/lessThan.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("lessThan", () => {
diff --git a/packages/schema/test/Schema/Number/lessThanOrEqualTo.test.ts b/packages/schema/test/Schema/Number/lessThanOrEqualTo.test.ts
index 2cafc0e714..77cb03ba3d 100644
--- a/packages/schema/test/Schema/Number/lessThanOrEqualTo.test.ts
+++ b/packages/schema/test/Schema/Number/lessThanOrEqualTo.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("lessThanOrEqualTo", () => {
diff --git a/packages/schema/test/Schema/Number/multipleOf.test.ts b/packages/schema/test/Schema/Number/multipleOf.test.ts
index 927c3c7761..f927653ef2 100644
--- a/packages/schema/test/Schema/Number/multipleOf.test.ts
+++ b/packages/schema/test/Schema/Number/multipleOf.test.ts
@@ -1,6 +1,6 @@
 import * as P from "@effect/schema/ParseResult"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("multipleOf", () => {
diff --git a/packages/schema/test/Schema/Number/negative.test.ts b/packages/schema/test/Schema/Number/negative.test.ts
index d1b509862f..d699e51f5f 100644
--- a/packages/schema/test/Schema/Number/negative.test.ts
+++ b/packages/schema/test/Schema/Number/negative.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Negative", () => {
diff --git a/packages/schema/test/Schema/Number/nonNaN.test.ts b/packages/schema/test/Schema/Number/nonNaN.test.ts
index b0c86b4ba0..dde133d8b6 100644
--- a/packages/schema/test/Schema/Number/nonNaN.test.ts
+++ b/packages/schema/test/Schema/Number/nonNaN.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("NonNaN", () => {
diff --git a/packages/schema/test/Schema/Number/nonNegative.test.ts b/packages/schema/test/Schema/Number/nonNegative.test.ts
index 9951aadb7a..232e30947a 100644
--- a/packages/schema/test/Schema/Number/nonNegative.test.ts
+++ b/packages/schema/test/Schema/Number/nonNegative.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("NonNegative", () => {
diff --git a/packages/schema/test/Schema/Number/nonPositive.test.ts b/packages/schema/test/Schema/Number/nonPositive.test.ts
index 78404d63f4..96c89da00a 100644
--- a/packages/schema/test/Schema/Number/nonPositive.test.ts
+++ b/packages/schema/test/Schema/Number/nonPositive.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("NonPositive", () => {
diff --git a/packages/schema/test/Schema/Number/numberFromString.test.ts b/packages/schema/test/Schema/Number/numberFromString.test.ts
index 9aaaf057d9..f72b9c344b 100644
--- a/packages/schema/test/Schema/Number/numberFromString.test.ts
+++ b/packages/schema/test/Schema/Number/numberFromString.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("NumberFromString", () => {
diff --git a/packages/schema/test/Schema/Number/positive.test.ts b/packages/schema/test/Schema/Number/positive.test.ts
index 6e851ea1d7..abc15a7533 100644
--- a/packages/schema/test/Schema/Number/positive.test.ts
+++ b/packages/schema/test/Schema/Number/positive.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Positive", () => {
diff --git a/packages/schema/test/Schema/Object/Object.test.ts b/packages/schema/test/Schema/Object/Object.test.ts
index 1de17b110f..e517fb00dd 100644
--- a/packages/schema/test/Schema/Object/Object.test.ts
+++ b/packages/schema/test/Schema/Object/Object.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("object", () => {
diff --git a/packages/schema/test/Schema/Option/Option.test.ts b/packages/schema/test/Schema/Option/Option.test.ts
index b3d2b4830b..a23a0683b6 100644
--- a/packages/schema/test/Schema/Option/Option.test.ts
+++ b/packages/schema/test/Schema/Option/Option.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as O from "effect/Option"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Option/OptionFromNullOr.test.ts b/packages/schema/test/Schema/Option/OptionFromNullOr.test.ts
index 05b1e7d5dd..944792b4f7 100644
--- a/packages/schema/test/Schema/Option/OptionFromNullOr.test.ts
+++ b/packages/schema/test/Schema/Option/OptionFromNullOr.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as O from "effect/Option"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Option/OptionFromNullishOr.test.ts b/packages/schema/test/Schema/Option/OptionFromNullishOr.test.ts
index bf847516be..22a88e5dfc 100644
--- a/packages/schema/test/Schema/Option/OptionFromNullishOr.test.ts
+++ b/packages/schema/test/Schema/Option/OptionFromNullishOr.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as O from "effect/Option"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Option/OptionFromSelf.test.ts b/packages/schema/test/Schema/Option/OptionFromSelf.test.ts
index 5b9bda631f..207eced194 100644
--- a/packages/schema/test/Schema/Option/OptionFromSelf.test.ts
+++ b/packages/schema/test/Schema/Option/OptionFromSelf.test.ts
@@ -1,11 +1,15 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as O from "effect/Option"
 import { describe, expect, it } from "vitest"
 
 describe("OptionFromSelf", () => {
+  it("arbitrary", () => {
+    Util.expectArbitrary(S.OptionFromSelf(S.Number))
+  })
+
   it("property tests", () => {
     Util.roundtrip(S.OptionFromSelf(S.NumberFromString))
   })
diff --git a/packages/schema/test/Schema/Option/OptionFromUndefinedOr.test.ts b/packages/schema/test/Schema/Option/OptionFromUndefinedOr.test.ts
index f4624f3b36..34689ff963 100644
--- a/packages/schema/test/Schema/Option/OptionFromUndefinedOr.test.ts
+++ b/packages/schema/test/Schema/Option/OptionFromUndefinedOr.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as O from "effect/Option"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/ParseOptions-errors.test.ts b/packages/schema/test/Schema/ParseOptions-errors.test.ts
index cf53e14c2e..a6d04bcca9 100644
--- a/packages/schema/test/Schema/ParseOptions-errors.test.ts
+++ b/packages/schema/test/Schema/ParseOptions-errors.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("`errors` option", () => {
diff --git a/packages/schema/test/Schema/ParseOptions-onExcessProperty.test.ts b/packages/schema/test/Schema/ParseOptions-onExcessProperty.test.ts
index daee9d4dac..5b577d8680 100644
--- a/packages/schema/test/Schema/ParseOptions-onExcessProperty.test.ts
+++ b/packages/schema/test/Schema/ParseOptions-onExcessProperty.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("`onExcessProperty` option", () => {
diff --git a/packages/schema/test/Schema/PropertySignature.test.ts b/packages/schema/test/Schema/PropertySignature.test.ts
index b593958f5b..79c384f0df 100644
--- a/packages/schema/test/Schema/PropertySignature.test.ts
+++ b/packages/schema/test/Schema/PropertySignature.test.ts
@@ -1,6 +1,6 @@
 import * as AST from "@effect/schema/AST"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { identity } from "effect/Function"
 import * as Option from "effect/Option"
 import { describe, expect, it } from "vitest"
diff --git a/packages/schema/test/Schema/ReadonlyMap/ReadonlyMap.test.ts b/packages/schema/test/Schema/ReadonlyMap/ReadonlyMap.test.ts
index 347f610aae..6eb3a962e8 100644
--- a/packages/schema/test/Schema/ReadonlyMap/ReadonlyMap.test.ts
+++ b/packages/schema/test/Schema/ReadonlyMap/ReadonlyMap.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("ReadonlyMap", () => {
diff --git a/packages/schema/test/Schema/ReadonlyMap/ReadonlyMapFromSelf.test.ts b/packages/schema/test/Schema/ReadonlyMap/ReadonlyMapFromSelf.test.ts
index 98bbd912c9..c4f74c5d6e 100644
--- a/packages/schema/test/Schema/ReadonlyMap/ReadonlyMapFromSelf.test.ts
+++ b/packages/schema/test/Schema/ReadonlyMap/ReadonlyMapFromSelf.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("ReadonlyMapFromSelf", () => {
diff --git a/packages/schema/test/Schema/ReadonlySet/ReadonlySet.test.ts b/packages/schema/test/Schema/ReadonlySet/ReadonlySet.test.ts
index a6ab0fc952..38aca6bac5 100644
--- a/packages/schema/test/Schema/ReadonlySet/ReadonlySet.test.ts
+++ b/packages/schema/test/Schema/ReadonlySet/ReadonlySet.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("ReadonlySet", () => {
diff --git a/packages/schema/test/Schema/ReadonlySet/ReadonlySetFromSelf.test.ts b/packages/schema/test/Schema/ReadonlySet/ReadonlySetFromSelf.test.ts
index c25d16b3b0..2561faffea 100644
--- a/packages/schema/test/Schema/ReadonlySet/ReadonlySetFromSelf.test.ts
+++ b/packages/schema/test/Schema/ReadonlySet/ReadonlySetFromSelf.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("ReadonlySetFromSelf", () => {
diff --git a/packages/schema/test/Schema/Record/Record.test.ts b/packages/schema/test/Schema/Record/Record.test.ts
index f5c8eb2038..dfa4ca2d0c 100644
--- a/packages/schema/test/Schema/Record/Record.test.ts
+++ b/packages/schema/test/Schema/Record/Record.test.ts
@@ -1,6 +1,6 @@
 import * as AST from "@effect/schema/AST"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as Either from "effect/Either"
 import { assert, describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Secret/Secret.test.ts b/packages/schema/test/Schema/Secret/Secret.test.ts
index f5b9d6285f..710d7811a9 100644
--- a/packages/schema/test/Schema/Secret/Secret.test.ts
+++ b/packages/schema/test/Schema/Secret/Secret.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Secret } from "effect"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/Secret/SecretFromSelf.test.ts b/packages/schema/test/Schema/Secret/SecretFromSelf.test.ts
index e573565276..55dea44a34 100644
--- a/packages/schema/test/Schema/Secret/SecretFromSelf.test.ts
+++ b/packages/schema/test/Schema/Secret/SecretFromSelf.test.ts
@@ -1,6 +1,6 @@
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { Secret } from "effect"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/SortedSet/SortedSet.test.ts b/packages/schema/test/Schema/SortedSet/SortedSet.test.ts
index 6c3f599378..ed46583031 100644
--- a/packages/schema/test/Schema/SortedSet/SortedSet.test.ts
+++ b/packages/schema/test/Schema/SortedSet/SortedSet.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as N from "effect/Number"
 import * as SortedSet from "effect/SortedSet"
 import { describe, it } from "vitest"
diff --git a/packages/schema/test/Schema/SortedSet/SortedSetFromSelf.test.ts b/packages/schema/test/Schema/SortedSet/SortedSetFromSelf.test.ts
index da0d8a5f91..db62237503 100644
--- a/packages/schema/test/Schema/SortedSet/SortedSetFromSelf.test.ts
+++ b/packages/schema/test/Schema/SortedSet/SortedSetFromSelf.test.ts
@@ -2,7 +2,7 @@ import * as Equivalence from "@effect/schema/Equivalence"
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as Schema from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as N from "effect/Number"
 import * as SortedSet from "effect/SortedSet"
 import * as S from "effect/String"
diff --git a/packages/schema/test/Schema/String/String.test.ts b/packages/schema/test/Schema/String/String.test.ts
index 0ff309298f..3de1250935 100644
--- a/packages/schema/test/Schema/String/String.test.ts
+++ b/packages/schema/test/Schema/String/String.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("String", () => {
diff --git a/packages/schema/test/Schema/String/endsWith.test.ts b/packages/schema/test/Schema/String/endsWith.test.ts
index bdb6ad270a..015426fbf4 100644
--- a/packages/schema/test/Schema/String/endsWith.test.ts
+++ b/packages/schema/test/Schema/String/endsWith.test.ts
@@ -1,6 +1,6 @@
 import * as P from "@effect/schema/ParseResult"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("endsWith", () => {
diff --git a/packages/schema/test/Schema/String/includes.test.ts b/packages/schema/test/Schema/String/includes.test.ts
index f6d2a162c1..3d5a9402c5 100644
--- a/packages/schema/test/Schema/String/includes.test.ts
+++ b/packages/schema/test/Schema/String/includes.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("includes", () => {
diff --git a/packages/schema/test/Schema/String/length.test.ts b/packages/schema/test/Schema/String/length.test.ts
index 5c42322180..26cccb8f31 100644
--- a/packages/schema/test/Schema/String/length.test.ts
+++ b/packages/schema/test/Schema/String/length.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("length", () => {
diff --git a/packages/schema/test/Schema/String/lowercase.test.ts b/packages/schema/test/Schema/String/lowercase.test.ts
index 2bc3f9415d..40908c51e8 100644
--- a/packages/schema/test/Schema/String/lowercase.test.ts
+++ b/packages/schema/test/Schema/String/lowercase.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Lowercase", () => {
diff --git a/packages/schema/test/Schema/String/maxLength.test.ts b/packages/schema/test/Schema/String/maxLength.test.ts
index a2096d5e10..71959f3409 100644
--- a/packages/schema/test/Schema/String/maxLength.test.ts
+++ b/packages/schema/test/Schema/String/maxLength.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("maxLength", () => {
diff --git a/packages/schema/test/Schema/String/minLength.test.ts b/packages/schema/test/Schema/String/minLength.test.ts
index 7abb4c8967..73e5cd0361 100644
--- a/packages/schema/test/Schema/String/minLength.test.ts
+++ b/packages/schema/test/Schema/String/minLength.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("minLength", () => {
diff --git a/packages/schema/test/Schema/String/nonEmpty.test.ts b/packages/schema/test/Schema/String/nonEmpty.test.ts
index 5378f4811a..043463144d 100644
--- a/packages/schema/test/Schema/String/nonEmpty.test.ts
+++ b/packages/schema/test/Schema/String/nonEmpty.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("nonEmpty", () => {
diff --git a/packages/schema/test/Schema/String/pattern.test.ts b/packages/schema/test/Schema/String/pattern.test.ts
index 9c0807fa91..df6c17b61a 100644
--- a/packages/schema/test/Schema/String/pattern.test.ts
+++ b/packages/schema/test/Schema/String/pattern.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("pattern", () => {
diff --git a/packages/schema/test/Schema/String/split.test.ts b/packages/schema/test/Schema/String/split.test.ts
index d123d1927d..f1c986474a 100644
--- a/packages/schema/test/Schema/String/split.test.ts
+++ b/packages/schema/test/Schema/String/split.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("string/split", () => {
diff --git a/packages/schema/test/Schema/String/startsWith.test.ts b/packages/schema/test/Schema/String/startsWith.test.ts
index bdde9779b2..51a8681b94 100644
--- a/packages/schema/test/Schema/String/startsWith.test.ts
+++ b/packages/schema/test/Schema/String/startsWith.test.ts
@@ -1,6 +1,6 @@
 import * as P from "@effect/schema/ParseResult"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("startsWith", () => {
diff --git a/packages/schema/test/Schema/String/trim.test.ts b/packages/schema/test/Schema/String/trim.test.ts
index 49cf77cc50..1f9d8edee0 100644
--- a/packages/schema/test/Schema/String/trim.test.ts
+++ b/packages/schema/test/Schema/String/trim.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("trim", () => {
diff --git a/packages/schema/test/Schema/String/trimmed.test.ts b/packages/schema/test/Schema/String/trimmed.test.ts
index ebc4890de2..117e2f93a2 100644
--- a/packages/schema/test/Schema/String/trimmed.test.ts
+++ b/packages/schema/test/Schema/String/trimmed.test.ts
@@ -1,7 +1,7 @@
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("string/trimmed", () => {
diff --git a/packages/schema/test/Schema/String/uppercase.test.ts b/packages/schema/test/Schema/String/uppercase.test.ts
index 0057fe7917..50e020953b 100644
--- a/packages/schema/test/Schema/String/uppercase.test.ts
+++ b/packages/schema/test/Schema/String/uppercase.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Uppercase", () => {
diff --git a/packages/schema/test/Schema/Struct/Struct.test.ts b/packages/schema/test/Schema/Struct/Struct.test.ts
index 25a9050410..34ab9649a5 100644
--- a/packages/schema/test/Schema/Struct/Struct.test.ts
+++ b/packages/schema/test/Schema/Struct/Struct.test.ts
@@ -1,6 +1,6 @@
 import * as AST from "@effect/schema/AST"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("Struct", () => {
diff --git a/packages/schema/test/Schema/Symbol/Symbol.test.ts b/packages/schema/test/Schema/Symbol/Symbol.test.ts
index 3cd70c37b5..adf73657de 100644
--- a/packages/schema/test/Schema/Symbol/Symbol.test.ts
+++ b/packages/schema/test/Schema/Symbol/Symbol.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Symbol", () => {
diff --git a/packages/schema/test/Schema/Symbol/SymbolFromSelf.test.ts b/packages/schema/test/Schema/Symbol/SymbolFromSelf.test.ts
index f1f40b41c5..01863a573a 100644
--- a/packages/schema/test/Schema/Symbol/SymbolFromSelf.test.ts
+++ b/packages/schema/test/Schema/Symbol/SymbolFromSelf.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("SymbolFromSelf", () => {
diff --git a/packages/schema/test/Schema/TemplateLiteral/TemplateLiteral.test.ts b/packages/schema/test/Schema/TemplateLiteral/TemplateLiteral.test.ts
index 60e761d987..f4aa4c29f5 100644
--- a/packages/schema/test/Schema/TemplateLiteral/TemplateLiteral.test.ts
+++ b/packages/schema/test/Schema/TemplateLiteral/TemplateLiteral.test.ts
@@ -1,6 +1,6 @@
 import * as AST from "@effect/schema/AST"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("TemplateLiteral", () => {
diff --git a/packages/schema/test/Schema/Tuple/Tuple.test.ts b/packages/schema/test/Schema/Tuple/Tuple.test.ts
index 87bae64848..39189a998d 100644
--- a/packages/schema/test/Schema/Tuple/Tuple.test.ts
+++ b/packages/schema/test/Schema/Tuple/Tuple.test.ts
@@ -1,6 +1,6 @@
 import * as AST from "@effect/schema/AST"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("Tuple", () => {
diff --git a/packages/schema/test/Schema/ULID.test.ts b/packages/schema/test/Schema/ULID.test.ts
index c5725e7f91..39080d9491 100644
--- a/packages/schema/test/Schema/ULID.test.ts
+++ b/packages/schema/test/Schema/ULID.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("ULID", () => {
diff --git a/packages/schema/test/Schema/UUID.test.ts b/packages/schema/test/Schema/UUID.test.ts
index 312c75701c..f5cfbd145f 100644
--- a/packages/schema/test/Schema/UUID.test.ts
+++ b/packages/schema/test/Schema/UUID.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("string/UUID", () => {
diff --git a/packages/schema/test/Schema/Uint8Array/Uint8Array.test.ts b/packages/schema/test/Schema/Uint8Array/Uint8Array.test.ts
index 47f95c4049..3cc2b8227e 100644
--- a/packages/schema/test/Schema/Uint8Array/Uint8Array.test.ts
+++ b/packages/schema/test/Schema/Uint8Array/Uint8Array.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("Uint8Array > Uint8Array", () => {
diff --git a/packages/schema/test/Schema/Uint8Array/Uint8ArrayFromSelf.test.ts b/packages/schema/test/Schema/Uint8Array/Uint8ArrayFromSelf.test.ts
index d72c2daf4c..32c1ec1d0a 100644
--- a/packages/schema/test/Schema/Uint8Array/Uint8ArrayFromSelf.test.ts
+++ b/packages/schema/test/Schema/Uint8Array/Uint8ArrayFromSelf.test.ts
@@ -1,6 +1,6 @@
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("Uint8Array > Uint8ArrayFromSelf", () => {
diff --git a/packages/schema/test/Schema/Union/Union.test.ts b/packages/schema/test/Schema/Union/Union.test.ts
index a4dcaaf472..609c89f723 100644
--- a/packages/schema/test/Schema/Union/Union.test.ts
+++ b/packages/schema/test/Schema/Union/Union.test.ts
@@ -1,6 +1,6 @@
 import * as AST from "@effect/schema/AST"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("Union", () => {
diff --git a/packages/schema/test/Schema/UniqueSymbol/UniqueSymbolFromSelf.test.ts b/packages/schema/test/Schema/UniqueSymbol/UniqueSymbolFromSelf.test.ts
index a6bd3784c2..b9913dafb2 100644
--- a/packages/schema/test/Schema/UniqueSymbol/UniqueSymbolFromSelf.test.ts
+++ b/packages/schema/test/Schema/UniqueSymbol/UniqueSymbolFromSelf.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("UniqueSymbolFromSelf", () => {
diff --git a/packages/schema/test/Schema/Unknown/Unknown.test.ts b/packages/schema/test/Schema/Unknown/Unknown.test.ts
index d7acd45510..5ee25e129d 100644
--- a/packages/schema/test/Schema/Unknown/Unknown.test.ts
+++ b/packages/schema/test/Schema/Unknown/Unknown.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("Unknown", () => {
diff --git a/packages/schema/test/Schema/Void/Void.test.ts b/packages/schema/test/Schema/Void/Void.test.ts
index cf15c1c4ae..ddd7c78c3f 100644
--- a/packages/schema/test/Schema/Void/Void.test.ts
+++ b/packages/schema/test/Schema/Void/Void.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("void", () => {
diff --git a/packages/schema/test/Schema/annotations.test.ts b/packages/schema/test/Schema/annotations.test.ts
index 10c4221ec2..1aa07d8f65 100644
--- a/packages/schema/test/Schema/annotations.test.ts
+++ b/packages/schema/test/Schema/annotations.test.ts
@@ -2,7 +2,7 @@ import * as AST from "@effect/schema/AST"
 import type * as ParseResult from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe(".annotations()", () => {
diff --git a/packages/schema/test/Schema/asserts.test.ts b/packages/schema/test/Schema/asserts.test.ts
index 49c906a6bc..eeeff57134 100644
--- a/packages/schema/test/Schema/asserts.test.ts
+++ b/packages/schema/test/Schema/asserts.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 const expectAssertsSuccess = <A, I>(schema: S.Schema<A, I>, input: unknown) => {
diff --git a/packages/schema/test/Schema/attachPropertySignature.test.ts b/packages/schema/test/Schema/attachPropertySignature.test.ts
index c5cf973e25..1406663f1a 100644
--- a/packages/schema/test/Schema/attachPropertySignature.test.ts
+++ b/packages/schema/test/Schema/attachPropertySignature.test.ts
@@ -1,6 +1,6 @@
 import * as ParseResult from "@effect/schema/ParseResult"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("attachPropertySignature", () => {
diff --git a/packages/schema/test/Schema/brand.test.ts b/packages/schema/test/Schema/brand.test.ts
index 28bec536fb..df7f2060aa 100644
--- a/packages/schema/test/Schema/brand.test.ts
+++ b/packages/schema/test/Schema/brand.test.ts
@@ -1,7 +1,7 @@
 import * as AST from "@effect/schema/AST"
 import * as ParseResult from "@effect/schema/ParseResult"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as Brand from "effect/Brand"
 import * as Either from "effect/Either"
 import * as Option from "effect/Option"
diff --git a/packages/schema/test/Schema/compose.test.ts b/packages/schema/test/Schema/compose.test.ts
index d6a023496f..270fec42b6 100644
--- a/packages/schema/test/Schema/compose.test.ts
+++ b/packages/schema/test/Schema/compose.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("compose", async () => {
diff --git a/packages/schema/test/Schema/decode.test.ts b/packages/schema/test/Schema/decode.test.ts
index 7bae793471..5260c91789 100644
--- a/packages/schema/test/Schema/decode.test.ts
+++ b/packages/schema/test/Schema/decode.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("decode", () => {
diff --git a/packages/schema/test/Schema/decodeEither.test.ts b/packages/schema/test/Schema/decodeEither.test.ts
index 0ca0cd89ae..7881310f20 100644
--- a/packages/schema/test/Schema/decodeEither.test.ts
+++ b/packages/schema/test/Schema/decodeEither.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("decodeEither", () => {
diff --git a/packages/schema/test/Schema/decodeOption.test.ts b/packages/schema/test/Schema/decodeOption.test.ts
index 33bbedadea..7779795799 100644
--- a/packages/schema/test/Schema/decodeOption.test.ts
+++ b/packages/schema/test/Schema/decodeOption.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("decodeOption", () => {
diff --git a/packages/schema/test/Schema/decodePromise.test.ts b/packages/schema/test/Schema/decodePromise.test.ts
index d77388a35a..1b2afcfeb4 100644
--- a/packages/schema/test/Schema/decodePromise.test.ts
+++ b/packages/schema/test/Schema/decodePromise.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("decodePromise", () => {
diff --git a/packages/schema/test/Schema/decodeSync.test.ts b/packages/schema/test/Schema/decodeSync.test.ts
index 088d457abd..621480954e 100644
--- a/packages/schema/test/Schema/decodeSync.test.ts
+++ b/packages/schema/test/Schema/decodeSync.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("decodeSync", () => {
diff --git a/packages/schema/test/Schema/decodeUnknownEither.test.ts b/packages/schema/test/Schema/decodeUnknownEither.test.ts
index 358f697ef4..ecc07f6f05 100644
--- a/packages/schema/test/Schema/decodeUnknownEither.test.ts
+++ b/packages/schema/test/Schema/decodeUnknownEither.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("decodeUnknownEither", () => {
diff --git a/packages/schema/test/Schema/decodeUnknownOption.test.ts b/packages/schema/test/Schema/decodeUnknownOption.test.ts
index 19094b52f8..1f801c9efb 100644
--- a/packages/schema/test/Schema/decodeUnknownOption.test.ts
+++ b/packages/schema/test/Schema/decodeUnknownOption.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("decodeUnknownOption", () => {
diff --git a/packages/schema/test/Schema/decodeUnknownSync.test.ts b/packages/schema/test/Schema/decodeUnknownSync.test.ts
index 1ad9210018..945ee8850e 100644
--- a/packages/schema/test/Schema/decodeUnknownSync.test.ts
+++ b/packages/schema/test/Schema/decodeUnknownSync.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("decodeUnknownSync", () => {
diff --git a/packages/schema/test/Schema/encode.test.ts b/packages/schema/test/Schema/encode.test.ts
index 72627f9d22..80ada41f59 100644
--- a/packages/schema/test/Schema/encode.test.ts
+++ b/packages/schema/test/Schema/encode.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("encode", () => {
diff --git a/packages/schema/test/Schema/encodeEither.test.ts b/packages/schema/test/Schema/encodeEither.test.ts
index 4ca10d4805..d85f517051 100644
--- a/packages/schema/test/Schema/encodeEither.test.ts
+++ b/packages/schema/test/Schema/encodeEither.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("encodeEither", () => {
diff --git a/packages/schema/test/Schema/encodeOption.test.ts b/packages/schema/test/Schema/encodeOption.test.ts
index d5f9a7decd..19784ac864 100644
--- a/packages/schema/test/Schema/encodeOption.test.ts
+++ b/packages/schema/test/Schema/encodeOption.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("encodeOption", () => {
diff --git a/packages/schema/test/Schema/encodePromise.test.ts b/packages/schema/test/Schema/encodePromise.test.ts
index 5f4c5eb914..3ae5766691 100644
--- a/packages/schema/test/Schema/encodePromise.test.ts
+++ b/packages/schema/test/Schema/encodePromise.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("encodePromise", () => {
diff --git a/packages/schema/test/Schema/encodeSync.test.ts b/packages/schema/test/Schema/encodeSync.test.ts
index 0ae10e2738..8818be10d3 100644
--- a/packages/schema/test/Schema/encodeSync.test.ts
+++ b/packages/schema/test/Schema/encodeSync.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("encodeSync", () => {
diff --git a/packages/schema/test/Schema/encodeUnknownEither.test.ts b/packages/schema/test/Schema/encodeUnknownEither.test.ts
index 44f972cc75..50e9d7633e 100644
--- a/packages/schema/test/Schema/encodeUnknownEither.test.ts
+++ b/packages/schema/test/Schema/encodeUnknownEither.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("encodeUnknownEither", () => {
diff --git a/packages/schema/test/Schema/encodeUnknownOption.test.ts b/packages/schema/test/Schema/encodeUnknownOption.test.ts
index 2dccc30e50..f2acc345de 100644
--- a/packages/schema/test/Schema/encodeUnknownOption.test.ts
+++ b/packages/schema/test/Schema/encodeUnknownOption.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("encodeUnknownOption", () => {
diff --git a/packages/schema/test/Schema/encodeUnknownSync.test.ts b/packages/schema/test/Schema/encodeUnknownSync.test.ts
index 3d52569738..0f6fe49054 100644
--- a/packages/schema/test/Schema/encodeUnknownSync.test.ts
+++ b/packages/schema/test/Schema/encodeUnknownSync.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("encodeUnknownSync", () => {
diff --git a/packages/schema/test/Schema/encodedSchema.test.ts b/packages/schema/test/Schema/encodedSchema.test.ts
index 055216464d..7aa9145130 100644
--- a/packages/schema/test/Schema/encodedSchema.test.ts
+++ b/packages/schema/test/Schema/encodedSchema.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("encodedSchema", () => {
diff --git a/packages/schema/test/Schema/extend.test.ts b/packages/schema/test/Schema/extend.test.ts
index c332d45af3..c68d8ff274 100644
--- a/packages/schema/test/Schema/extend.test.ts
+++ b/packages/schema/test/Schema/extend.test.ts
@@ -1,6 +1,6 @@
 import * as AST from "@effect/schema/AST"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("extend", () => {
diff --git a/packages/schema/test/Schema/filter.test.ts b/packages/schema/test/Schema/filter.test.ts
index d3ca565416..8f0b9ea656 100644
--- a/packages/schema/test/Schema/filter.test.ts
+++ b/packages/schema/test/Schema/filter.test.ts
@@ -1,7 +1,7 @@
 import * as AST from "@effect/schema/AST"
 import * as ParseResult from "@effect/schema/ParseResult"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as TreeFormatter from "@effect/schema/TreeFormatter"
 import * as Option from "effect/Option"
 import { describe, expect, it } from "vitest"
diff --git a/packages/schema/test/Schema/fromBrand.test.ts b/packages/schema/test/Schema/fromBrand.test.ts
index f756766d47..7119549dc0 100644
--- a/packages/schema/test/Schema/fromBrand.test.ts
+++ b/packages/schema/test/Schema/fromBrand.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as Brand from "effect/Brand"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/getNumberIndexedAccess.test.ts b/packages/schema/test/Schema/getNumberIndexedAccess.test.ts
index 333a0908a2..5049e567ab 100644
--- a/packages/schema/test/Schema/getNumberIndexedAccess.test.ts
+++ b/packages/schema/test/Schema/getNumberIndexedAccess.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as Duration from "effect/Duration"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/instanceOf.test.ts b/packages/schema/test/Schema/instanceOf.test.ts
index 3e08991121..621e4a06b4 100644
--- a/packages/schema/test/Schema/instanceOf.test.ts
+++ b/packages/schema/test/Schema/instanceOf.test.ts
@@ -2,7 +2,7 @@ import * as AST from "@effect/schema/AST"
 import * as P from "@effect/schema/ParseResult"
 import * as Pretty from "@effect/schema/Pretty"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("instanceOf", () => {
diff --git a/packages/schema/test/Schema/is.test.ts b/packages/schema/test/Schema/is.test.ts
index 7c71a092b7..21e23293ac 100644
--- a/packages/schema/test/Schema/is.test.ts
+++ b/packages/schema/test/Schema/is.test.ts
@@ -1,6 +1,6 @@
 import * as P from "@effect/schema/ParseResult"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("is", () => {
diff --git a/packages/schema/test/Schema/omit.test.ts b/packages/schema/test/Schema/omit.test.ts
index 259b51c21d..f221886aca 100644
--- a/packages/schema/test/Schema/omit.test.ts
+++ b/packages/schema/test/Schema/omit.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("omit", () => {
diff --git a/packages/schema/test/Schema/optional.test.ts b/packages/schema/test/Schema/optional.test.ts
index a257995889..2b7dc83f1d 100644
--- a/packages/schema/test/Schema/optional.test.ts
+++ b/packages/schema/test/Schema/optional.test.ts
@@ -1,6 +1,6 @@
 import * as AST from "@effect/schema/AST"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as O from "effect/Option"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/optionalToRequired.test.ts b/packages/schema/test/Schema/optionalToRequired.test.ts
index 9bbd670125..38a0cf9659 100644
--- a/packages/schema/test/Schema/optionalToRequired.test.ts
+++ b/packages/schema/test/Schema/optionalToRequired.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as Option from "effect/Option"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/parseJson.test.ts b/packages/schema/test/Schema/parseJson.test.ts
index fefb8c2ec4..37e6f83df1 100644
--- a/packages/schema/test/Schema/parseJson.test.ts
+++ b/packages/schema/test/Schema/parseJson.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as Exit from "effect/Exit"
 import { describe, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/partial.test.ts b/packages/schema/test/Schema/partial.test.ts
index 26b5c2adae..5473c32385 100644
--- a/packages/schema/test/Schema/partial.test.ts
+++ b/packages/schema/test/Schema/partial.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { identity } from "effect/Function"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/pick.test.ts b/packages/schema/test/Schema/pick.test.ts
index ac9ccf04cb..2193107adc 100644
--- a/packages/schema/test/Schema/pick.test.ts
+++ b/packages/schema/test/Schema/pick.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("pick", () => {
diff --git a/packages/schema/test/Schema/pickLiteral.test.ts b/packages/schema/test/Schema/pickLiteral.test.ts
index 5077cc9815..2afdcf7d6b 100644
--- a/packages/schema/test/Schema/pickLiteral.test.ts
+++ b/packages/schema/test/Schema/pickLiteral.test.ts
@@ -1,6 +1,6 @@
 import * as AST from "@effect/schema/AST"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("literal > pickLiteral", () => {
diff --git a/packages/schema/test/Schema/pluck.test.ts b/packages/schema/test/Schema/pluck.test.ts
index 9130fa9f62..82689d92c6 100644
--- a/packages/schema/test/Schema/pluck.test.ts
+++ b/packages/schema/test/Schema/pluck.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("pluck", () => {
diff --git a/packages/schema/test/Schema/rename.test.ts b/packages/schema/test/Schema/rename.test.ts
index 686a0c7f5a..46303b1f08 100644
--- a/packages/schema/test/Schema/rename.test.ts
+++ b/packages/schema/test/Schema/rename.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("rename", () => {
diff --git a/packages/schema/test/Schema/required.test.ts b/packages/schema/test/Schema/required.test.ts
index cdba913a57..d3debb9957 100644
--- a/packages/schema/test/Schema/required.test.ts
+++ b/packages/schema/test/Schema/required.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { identity } from "effect/Function"
 import { describe, expect, it } from "vitest"
 
diff --git a/packages/schema/test/Schema/suspend.test.ts b/packages/schema/test/Schema/suspend.test.ts
index 06f081dad3..883ef6921e 100644
--- a/packages/schema/test/Schema/suspend.test.ts
+++ b/packages/schema/test/Schema/suspend.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("suspend", () => {
diff --git a/packages/schema/test/Schema/transformLiterals.test.ts b/packages/schema/test/Schema/transformLiterals.test.ts
index 097e6c8d7d..b60dd20664 100644
--- a/packages/schema/test/Schema/transformLiterals.test.ts
+++ b/packages/schema/test/Schema/transformLiterals.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("transformLiteral", () => {
diff --git a/packages/schema/test/Schema/typeSchema.test.ts b/packages/schema/test/Schema/typeSchema.test.ts
index 697ae0ef80..8b18fcf39f 100644
--- a/packages/schema/test/Schema/typeSchema.test.ts
+++ b/packages/schema/test/Schema/typeSchema.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("typeSchema", () => {
diff --git a/packages/schema/test/Schema/validate.test.ts b/packages/schema/test/Schema/validate.test.ts
index 64becb6dad..29315f56f3 100644
--- a/packages/schema/test/Schema/validate.test.ts
+++ b/packages/schema/test/Schema/validate.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 const expectValidateSuccess = async <A, I>(
diff --git a/packages/schema/test/Schema/validateEither.test.ts b/packages/schema/test/Schema/validateEither.test.ts
index c3515cf58d..17ba196629 100644
--- a/packages/schema/test/Schema/validateEither.test.ts
+++ b/packages/schema/test/Schema/validateEither.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("validateEither", () => {
diff --git a/packages/schema/test/Schema/validateOption.test.ts b/packages/schema/test/Schema/validateOption.test.ts
index 120094a21e..c3a1331789 100644
--- a/packages/schema/test/Schema/validateOption.test.ts
+++ b/packages/schema/test/Schema/validateOption.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("validateOption", () => {
diff --git a/packages/schema/test/Schema/validatePromise.test.ts b/packages/schema/test/Schema/validatePromise.test.ts
index 9793376f1a..2899f3d50b 100644
--- a/packages/schema/test/Schema/validatePromise.test.ts
+++ b/packages/schema/test/Schema/validatePromise.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, it } from "vitest"
 
 describe("validatePromise", () => {
diff --git a/packages/schema/test/Schema/validateSync.test.ts b/packages/schema/test/Schema/validateSync.test.ts
index b5f32ed495..ccd8bed4cb 100644
--- a/packages/schema/test/Schema/validateSync.test.ts
+++ b/packages/schema/test/Schema/validateSync.test.ts
@@ -1,5 +1,5 @@
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import { describe, expect, it } from "vitest"
 
 describe("validateSync", () => {
diff --git a/packages/schema/test/util.ts b/packages/schema/test/TestUtils.ts
similarity index 97%
rename from packages/schema/test/util.ts
rename to packages/schema/test/TestUtils.ts
index 9ac0e772a4..0ff14d4a70 100644
--- a/packages/schema/test/util.ts
+++ b/packages/schema/test/TestUtils.ts
@@ -80,6 +80,13 @@ const effectifyAST = (ast: AST.AST): AST.AST => {
 export const effectify = <A, I>(schema: S.Schema<A, I, never>): S.Schema<A, I, never> =>
   S.make(effectifyAST(schema.ast))
 
+export const expectArbitrary = <A, I>(schema: S.Schema<A, I, never>, n: number = 5) => {
+  const is = S.is(schema)
+  const as = fc.sample(A.make(schema), n)
+  // console.log(as)
+  expect(as.every((a) => is(a))).toBe(true)
+}
+
 export const roundtrip = <A, I>(schema: S.Schema<A, I, never>, params?: Parameters<typeof fc.assert>[1]) => {
   if (!doRoundtrip) {
     return
diff --git a/packages/schema/test/TreeFormatter.test.ts b/packages/schema/test/TreeFormatter.test.ts
index 15340f5148..64eb982192 100644
--- a/packages/schema/test/TreeFormatter.test.ts
+++ b/packages/schema/test/TreeFormatter.test.ts
@@ -1,6 +1,6 @@
 import * as ParseResult from "@effect/schema/ParseResult"
 import * as S from "@effect/schema/Schema"
-import * as Util from "@effect/schema/test/util"
+import * as Util from "@effect/schema/test/TestUtils"
 import * as TreeFormatter from "@effect/schema/TreeFormatter"
 import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"