diff --git a/Sources/Rorschach/Builders/TestBuilder.swift b/Sources/Rorschach/Builders/TestBuilder.swift
index 3cb1700..a8d724e 100644
--- a/Sources/Rorschach/Builders/TestBuilder.swift
+++ b/Sources/Rorschach/Builders/TestBuilder.swift
@@ -9,11 +9,11 @@ import Foundation
 
 @_functionBuilder public struct TestBuilder<C> {
 
-    static public func buildBlock(_ given: Given<C>, _ when: When<C>, _ then: Then<C>) -> (Given<C>, When<C>, Then<C>) {
+    public static func buildBlock(_ given: Given<C>, _ when: When<C>, _ then: Then<C>) -> (Given<C>, When<C>, Then<C>) {
         return (given, when, then)
     }
 
-    static public func buildBlock(_ when: When<C>, _ then: Then<C>) -> (When<C>, Then<C>) {
+    public static func buildBlock(_ when: When<C>, _ then: Then<C>) -> (When<C>, Then<C>) {
         return (when, then)
     }
 }
diff --git a/Sources/Rorschach/Builders/ThenBuilder.swift b/Sources/Rorschach/Builders/ThenBuilder.swift
index 98dca69..e2ddc15 100644
--- a/Sources/Rorschach/Builders/ThenBuilder.swift
+++ b/Sources/Rorschach/Builders/ThenBuilder.swift
@@ -8,9 +8,8 @@
 import Foundation
 
 
-@_functionBuilder struct ThenBuilder<C> {
-
-    static func buildBlock(_ assertion: Assertion<C>) -> Assertion<C> {
+@_functionBuilder public struct ThenBuilder<C> {
+    public static func buildBlock(_ assertion: Assertion<C>) -> Assertion<C> {
         assertion
     }
 }
diff --git a/Sources/Rorschach/When.swift b/Sources/Rorschach/When.swift
index f6b0c05..78eab54 100644
--- a/Sources/Rorschach/When.swift
+++ b/Sources/Rorschach/When.swift
@@ -10,15 +10,17 @@ import XCTest
 
 public struct When<C> {
 
-    let step: Step<C>
+    let steps: [Step<C>]
 
-    public init(@WhenBuilder<C> _ content: () -> Step<C>) {
-        step = content()
+    public init(@WhenBuilder<C> _ content: () -> [Step<C>]) {
+        steps = content()
     }
 
     func execute(in context: inout C) {
-        XCTContext.runActivity(named: step.title) { activity in
-            step.execute(in: &context)
+        steps.forEach { step in
+            XCTContext.runActivity(named: step.title ) { _ in
+                step.execute(in: &context)
+            }
         }
     }
 }