diff --git a/pub_sub/csharp/http/README.md b/pub_sub/csharp/http/README.md
index 295aa5746..ae9f92221 100644
--- a/pub_sub/csharp/http/README.md
+++ b/pub_sub/csharp/http/README.md
@@ -29,6 +29,7 @@ expected_stdout_lines:
   - '== APP - order-processor-http == Subscriber received : 10'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
 timeout_seconds: 30
@@ -78,53 +79,21 @@ An alternative to running all or multiple applications at once is to run single
 
 1. Run the Dotnet subscriber app with Dapr: 
 
-<!-- STEP
-name: Run Dotnet subscriber
-expected_stdout_lines:
-  - "You're up and running! Both Dapr and your app logs will appear here."
-  - '== APP == Subscriber received : 2'
-  - "Exited Dapr successfully"
-  - "Exited App successfully"
-expected_stderr_lines:
-working_dir: ./order-processor
-output_match_mode: substring
-background: true
-sleep: 10
--->
-
-
 ```bash
 cd ./order-processor
 dapr run --app-id order-processor-http --resources-path ../../../components/ --app-port 7005 -- dotnet run
 ```
 
-<!-- END_STEP -->
 ### Run Dotnet message publisher with Dapr
 
 1. Run the Dotnet publisher app with Dapr: 
 
-<!-- STEP
-name: Run Dotnet publisher
-expected_stdout_lines:
-  - "You're up and running! Both Dapr and your app logs will appear here."
-  - '== APP == Published data: Order { OrderId = 1 }'
-  - '== APP == Published data: Order { OrderId = 2 }'
-  - "Exited App successfully"
-  - "Exited Dapr successfully"
-expected_stderr_lines:
-working_dir: ./checkout
-output_match_mode: substring
-background: true
-sleep: 10
--->
-    
+  
 ```bash
 cd ./checkout
 dapr run --app-id checkout-http --resources-path ../../../components/ -- dotnet run
 ```
 
-<!-- END_STEP -->
-
 2. Stop and clean up application processes
 
 ```bash
diff --git a/pub_sub/csharp/sdk/README.md b/pub_sub/csharp/sdk/README.md
index 3cca55ba7..6f878313b 100644
--- a/pub_sub/csharp/sdk/README.md
+++ b/pub_sub/csharp/sdk/README.md
@@ -29,8 +29,10 @@ expected_stdout_lines:
   - '== APP - order-processor == Subscriber received : Order { OrderId = 10 }'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -77,53 +79,21 @@ An alternative to running all or multiple applications at once is to run single
 
 1. Run the Dotnet subscriber app with Dapr: 
 
-<!-- STEP
-name: Run Dotnet subscriber
-expected_stdout_lines:
-  - "You're up and running! Both Dapr and your app logs will appear here."
-  - '== APP == Subscriber received : Order { OrderId = 2 }'
-  - "Exited Dapr successfully"
-  - "Exited App successfully"
-expected_stderr_lines:
-working_dir: ./order-processor
-output_match_mode: substring
-background: true
-sleep: 10
--->
-
-
 ```bash
 cd ./order-processor
 dapr run --app-id order-processor --resources-path ../../../components/ --app-port 7006 -- dotnet run
 ```
 
-<!-- END_STEP -->
 ### Run Dotnet message publisher with Dapr
 
 1. Run the Dotnet publisher app with Dapr: 
 
-<!-- STEP
-name: Run Dotnet publisher
-expected_stdout_lines:
-  - "You're up and running! Both Dapr and your app logs will appear here."
-  - '== APP == Published data: Order { OrderId = 1 }'
-  - '== APP == Published data: Order { OrderId = 2 }'
-  - "Exited App successfully"
-  - "Exited Dapr successfully"
-expected_stderr_lines:
-working_dir: ./checkout
-output_match_mode: substring
-background: true
-sleep: 10
--->
-    
+   
 ```bash
 cd ./checkout
 dapr run --app-id checkout-sdk --resources-path ../../../components/ -- dotnet run
 ```
 
-<!-- END_STEP -->
-
 2. Stop and clean up application processes
 
 ```bash
diff --git a/pub_sub/go/http/README.md b/pub_sub/go/http/README.md
index 0db525fdb..6a4ec529e 100644
--- a/pub_sub/go/http/README.md
+++ b/pub_sub/go/http/README.md
@@ -21,12 +21,14 @@ name: Run multi app run template
 expected_stdout_lines:
   - 'Started Dapr with app id "order-processor-http"'
   - 'Started Dapr with app id "checkout-http"'
-  - '== APP - checkout-http == Published data: {"orderId":1}'
-  - '== APP - order-processor-http == Subscriber received: map[orderId:1]'
+  - '== APP - checkout-http == Published data: {"orderId":10}'
+  - '== APP - order-processor-http == Subscriber received: {"orderId":10}'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -73,47 +75,20 @@ An alternative to running all or multiple applications at once is to run single
 
 1. Run the Go subscriber app with Dapr in the `order-processor` folder:
 
-<!-- STEP
-name: Run Go subscriber
-expected_stdout_lines:
-  - '== APP == Subscriber received: {"orderId":10}'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 15
--->
-
 ```bash
 cd ./order-processor
-dapr run --app-port 6003 --app-id order-processor --app-protocol http --dapr-http-port 3501 --resources-path ../../../components -- go run .
+dapr run --app-port 6003 --app-id order-processor-http --app-protocol http --dapr-http-port 3501 --resources-path ../../../components -- go run .
 ```
 
-<!-- END_STEP -->
-
 ### Run Go message publisher with Dapr
 
 1. Run the Go publisher app with Dapr in the `checkout` folder:
 
-<!-- STEP
-name: Run Go publisher
-expected_stdout_lines:
-  - '== APP == Published data: {"orderId":1}'
-  - '== APP == Published data: {"orderId":2}'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 15
--->
-
 ```bash
 cd ./checkout
 dapr run --app-id checkout-http --app-protocol http --dapr-http-port 3500 --resources-path ../../../components -- go run .
 ```
 
-<!-- END_STEP -->
-
 To stop:
 
 ```bash
diff --git a/pub_sub/go/sdk/README.md b/pub_sub/go/sdk/README.md
index b8cb24aba..1ebfaf9ca 100644
--- a/pub_sub/go/sdk/README.md
+++ b/pub_sub/go/sdk/README.md
@@ -25,8 +25,10 @@ expected_stdout_lines:
   - '== APP - order-processor == Subscriber received: map[orderId:1]'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -73,47 +75,21 @@ An alternative to running all or multiple applications at once is to run single
 
 1. Run the Go subscriber app with Dapr in the `order-processor` folder:
 
-<!-- STEP
-name: Run Go subscriber
-expected_stdout_lines:
-  - '== APP == Subscriber received: map[orderId:10]'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 15
--->
 
 ```bash
 cd ./order-processor
 dapr run --app-port 6005 --app-id order-processor-sdk --app-protocol http --dapr-http-port 3501 --resources-path ../../../components -- go run .
 ```
 
-<!-- END_STEP -->
-
 ### Run Go message publisher with Dapr
 
 1 Run the Go publisher app with Dapr in the `checkout` folder:
 
-<!-- STEP
-name: Run Go publisher
-expected_stdout_lines:
-  - '== APP == Published data: {"orderId":1}'
-  - '== APP == Published data: {"orderId":2}'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 15
--->
-
 ```bash
 cd ./checkout
 dapr run --app-id checkout-sdk --app-protocol http --dapr-http-port 3500 --resources-path ../../../components -- go run .
 ```
 
-<!-- END_STEP -->
-
 To stop:
 
 ```bash
diff --git a/pub_sub/java/http/README.md b/pub_sub/java/http/README.md
index 3b574e001..1324d7967 100644
--- a/pub_sub/java/http/README.md
+++ b/pub_sub/java/http/README.md
@@ -49,12 +49,14 @@ name: Run multi app run template
 expected_stdout_lines:
   - 'Started Dapr with app id "order-processor-http"'
   - 'Started Dapr with app id "checkout-http"'
-  - '== APP - checkout-sdk == Published data: Order { OrderId = 10 }'
-  - '== APP - order-processor == Subscriber received : Order { OrderId = 10 }'
+  - 'Published data: 10'
+  - 'Subscriber received: 10'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -100,66 +102,34 @@ An alternative to running all or multiple applications at once is to run single
 ### Run Java message subscriber app with Dapr
 
 1. Navigate to directory and install dependencies:
-<!-- STEP
-name: Install Java dependencies
--->
 
 ```bash
 cd ./order-processor
 mvn clean install
 ```
-<!-- END_STEP -->
 
 2. Run the Java subscriber app with Dapr:
-<!-- STEP
-name: Run Java publisher
-expected_stdout_lines:
-  - 'Subscriber received: 2'
-  - "Exited App successfully"
-expected_stderr_lines:
-working_dir: ./order-processor
-output_match_mode: substring
-background: true
-sleep: 10
--->
+
 ```bash
 cd ./order-processor
  dapr run --app-port 8080 --app-id order-processor-http --resources-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
 ```
-<!-- END_STEP -->
+
 ### Run Java message publisher app with Dapr
 
 1. Navigate to the directory and install dependencies:
 
-<!-- STEP
-name: Install Java dependencies
--->
-
 ```bash
 cd ./checkout
 mvn clean install
 ```
-<!-- END_STEP -->
 
 2. Run the Java publisher app with Dapr:
-<!-- STEP
-name: Run Java publisher
-expected_stdout_lines:
-  - 'Published data: 1'
-  - 'Published data: 2'
-  - "Exited App successfully"
-expected_stderr_lines:
-working_dir: ./checkout
-output_match_mode: substring
-background: true
-sleep: 10
--->
 
 ```bash
 cd ./checkout
  dapr run --app-id checkout-http --resources-path ../../../components -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
 ```
-<!-- END_STEP -->
 
 ```bash
 dapr stop --app-id checkout-http
diff --git a/pub_sub/java/http/dapr.yaml b/pub_sub/java/http/dapr.yaml
index 098e705b1..dfcf0a889 100644
--- a/pub_sub/java/http/dapr.yaml
+++ b/pub_sub/java/http/dapr.yaml
@@ -4,7 +4,7 @@ common:
 apps:
   - appID: order-processor-http
     appDirPath: ./order-processor/target/
-    appPort: 8081
+    appPort: 8080
     command: ["java", "-jar", "OrderProcessingService-0.0.1-SNAPSHOT.jar"]
   - appID: checkout-http
     appDirPath: ./checkout/target/
diff --git a/pub_sub/java/sdk/README.md b/pub_sub/java/sdk/README.md
index 306cda368..780fb2397 100644
--- a/pub_sub/java/sdk/README.md
+++ b/pub_sub/java/sdk/README.md
@@ -53,8 +53,10 @@ expected_stdout_lines:
   - '== APP - order-processor == Subscriber received : Order { OrderId = 10 }'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -100,67 +102,34 @@ An alternative to running all or multiple applications at once is to run single
 ### Run Java message subscriber app with Dapr
 
 1. Navigate to directory and install dependencies:
-<!-- STEP
-name: Install Java dependencies
--->
 
 ```bash
 cd ./order-processor
 mvn clean install
 ```
-<!-- END_STEP -->
 
 2. Run the Java subscriber app with Dapr:
-<!-- STEP
-name: Run Java publisher
-working_dir: ./order-processor
-expected_stdout_lines:
-  - 'Subscriber received: 2'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 10
--->
+
 ```bash
 cd ./order-processor
  dapr run --app-port 8080 --app-id order-processor-sdk --resources-path ../../../components -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
 ```
-<!-- END_STEP -->
 
 ### Run Java message publisher app with Dapr
 
 1. Navigate to the directory and install dependencies:
 
-<!-- STEP
-name: Install Java dependencies
--->
-
 ```bash
 cd ./checkout
 mvn clean install
 ```
-<!-- END_STEP -->
 
 2. Run the Java publisher app with Dapr:
-<!-- STEP
-name: Run Java publisher
-working_dir: ./checkout
-expected_stdout_lines:
-  - 'Published data: 1'
-  - 'Published data: 2'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 10
--->
 
 ```bash
 cd ./checkout
 dapr run --app-id checkout-sdk --resources-path ../../../components -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
 ```
-<!-- END_STEP -->
 
 ```bash
 dapr stop --app-id checkout-sdk
diff --git a/pub_sub/javascript/http/README.md b/pub_sub/javascript/http/README.md
index 5856e51a3..0e527f603 100644
--- a/pub_sub/javascript/http/README.md
+++ b/pub_sub/javascript/http/README.md
@@ -39,13 +39,15 @@ npm install
 name: Run multi app run template
 expected_stdout_lines:
   - 'Started Dapr with app id "order-processor-http"'
-  - 'Started Dapr with app id "checkout-sdk-http"'
-  - '== APP - checkout-sdk-http == Published data: {"orderId":1}'
-  - '== APP - order-processor-http == Subscriber received: { orderId: 1 }'
+  - 'Started Dapr with app id "checkout-http"'
+  - '== APP - checkout-http == Published data: {"orderId":10}'
+  - '== APP - order-processor-http == Subscriber received: { orderId: 10 }'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -92,140 +94,33 @@ An alternative to running all or multiple applications at once is to run single
 
 1. Install dependencies: 
 
-<!-- STEP
-name: Install Node dependencies
--->
-
 ```bash
 cd ./order-processor
 npm install
 ```
-<!-- END_STEP -->
-3. Run the Node publisher app with Dapr: 
 
-<!-- STEP
-name: Run Node publisher
-expected_stdout_lines:
-  - '== APP == Subscriber received: {"orderId":2}'
-  - "Exited App successfully"
-expected_stderr_lines:
-working_dir: ./order-processor
-output_match_mode: substring
-background: true
-sleep: 10
--->
+2. Run the Node publisher app with Dapr: 
     
 ```bash
 dapr run --app-port 5003 --app-id order-processing-http --app-protocol http --dapr-http-port 3501 --resources-path ../../../components -- npm run start
 ```
 
-<!-- END_STEP -->
-
 ### Run Node message publisher with Dapr
 
 1. Install dependencies: 
 
-<!-- STEP
-name: Install Node dependencies
--->
-
 ```bash
 cd ./checkout
 npm install
 ```
-<!-- END_STEP -->
-3. Run the Node publisher app with Dapr: 
-
-<!-- STEP
-name: Run Node publisher
-expected_stdout_lines:
-  - '== APP == Published data: {"orderId":2}'
-  - '== APP == Published data: {"orderId":3}'
-  - "Exited App successfully"
-expected_stderr_lines:
-working_dir: ./checkout
-output_match_mode: substring
-background: true
-sleep: 10
--->
-    
-```bash
-dapr run --app-id checkout-http --app-protocol http --dapr-http-port 3500 --resources-path ../../../components -- npm run start
-```
-
-<!-- END_STEP -->
-
-```bash
-dapr stop --app-id checkout-http
-dapr stop --app-id order-processor-http
-```
-
-### Run Node message subscriber with Dapr
-
-1. Install dependencies: 
-
-<!-- STEP
-name: Install Node dependencies
--->
-
-```bash
-cd ./order-processor
-npm install
-```
-<!-- END_STEP -->
-2. Run the Node publisher app with Dapr: 
-
-<!-- STEP
-name: Run Node publisher
-expected_stdout_lines:
-  - "You're up and running! Both Dapr and your app logs will appear here."
-  - "Exited App successfully"
-expected_stderr_lines:
-working_dir: ./order-processor
-output_match_mode: substring
-background: true
-sleep: 10
--->
-    
-```bash
-dapr run --app-id order-processor-http --resources-path ../../../components/  --app-port 5003 -- node .
-```
 
-<!-- END_STEP -->
-
-### Run Node message publisher with Dapr
-
-1. Install dependencies: 
-
-<!-- STEP
-name: Install Node dependencies
--->
-
-```bash
-cd ./checkout
-npm install
-```
-<!-- END_STEP -->
 2. Run the Node publisher app with Dapr: 
-
-<!-- STEP
-name: Run Node publisher
-expected_stdout_lines:
-  - '== APP == Published data: {"orderId":2}'
-  - '== APP == Published data: {"orderId":3}'
-  - "Exited App successfully"
-expected_stderr_lines:
-working_dir: ./checkout
-output_match_mode: substring
-background: true
-sleep: 10
--->
     
 ```bash
-dapr run --app-id checkout-http --resources-path ../../../components/  --app-port 5003 -- node .
+dapr run --app-id checkout-http --app-protocol http --dapr-http-port 3500 --resources-path ../../../components -- npm run start
 ```
 
-<!-- END_STEP -->
+### Stop the apps and clean up
 
 ```bash
 dapr stop --app-id checkout-http
diff --git a/pub_sub/javascript/sdk/README.md b/pub_sub/javascript/sdk/README.md
index 271ef8efe..cb6b65124 100644
--- a/pub_sub/javascript/sdk/README.md
+++ b/pub_sub/javascript/sdk/README.md
@@ -42,8 +42,10 @@ expected_stdout_lines:
   - '== APP - order-processor == Subscriber received: {"orderId":1}'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
diff --git a/pub_sub/python/http/README.md b/pub_sub/python/http/README.md
index 6412d1e81..0bd25647b 100644
--- a/pub_sub/python/http/README.md
+++ b/pub_sub/python/http/README.md
@@ -21,7 +21,7 @@ This section shows how to run both applications at once using [multi-app run tem
 1. Install dependencies: 
 
 <!-- STEP
-name: Install Node dependencies
+name: Install Python dependencies
 -->
 
 ```bash
@@ -44,8 +44,10 @@ expected_stdout_lines:
   - '== APP - order-processor-http == Subscriber received : 1'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -98,71 +100,33 @@ An alternative to running all or multiple applications at once is to run single
 
 1. Install dependencies: 
 
-<!-- STEP
-name: Install Node dependencies
--->
-
 ```bash
 cd ./order-processor
 pip3 install -r requirements.txt
 ```
 
-<!-- END_STEP -->
-
 2. Run the Python subscriber app with Dapr: 
 
-<!-- STEP
-name: Run python subscriber
-expected_stdout_lines:
-  - '== APP == Subscriber received : 4'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-working_dir: ./order-processor
-background: true
-sleep: 10
--->
-
 ```bash
 dapr run --app-id order-processor-http --resources-path ../../../components/ --app-port 6021 -- uvicorn app:app --port 6002
 ```
 
-<!-- END_STEP -->
-
 ### Run Python message publisher with Dapr
 
 1. Install dependencies: 
 
-<!-- STEP
-name: Install python dependencies
--->
-
 ```bash
 cd ./checkout
 pip3 install -r requirements.txt 
 ```
-<!-- END_STEP -->
 
 2. Run the Python publisher app with Dapr: 
 
-<!-- STEP
-name: Run python publisher
-expected_stdout_lines:
-  - '== APP == INFO:root:Published data: {"orderId": 1}'
-  - '== APP == INFO:root:Published data: {"orderId": 2}'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-working_dir: ./checkout
-background: true
-sleep: 10
--->
-
 ```bash
 dapr run --app-id checkout-http --resources-path ../../../components/ -- python3 app.py
 ```
 
-<!-- END_STEP -->
+### Stop the apps and clean up
 
 ```bash
 dapr stop --app-id checkout-http
diff --git a/pub_sub/python/sdk/README.md b/pub_sub/python/sdk/README.md
index 52ec54d96..f1c9e45b9 100644
--- a/pub_sub/python/sdk/README.md
+++ b/pub_sub/python/sdk/README.md
@@ -21,7 +21,7 @@ This section shows how to run both applications at once using [multi-app run tem
 1. Install dependencies: 
 
 <!-- STEP
-name: Install Node dependencies
+name: Install Python dependencies
 -->
 
 ```bash
@@ -44,8 +44,10 @@ expected_stdout_lines:
   - '== APP - order-processor-sdk == Subscriber received : 1'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -99,71 +101,33 @@ An alternative to running all or multiple applications at once is to run single
 
 1. Install dependencies: 
 
-<!-- STEP
-name: Install Node dependencies
--->
-
 ```bash
 cd ./order-processor
 pip3 install -r requirements.txt
 ```
 
-<!-- END_STEP -->
-
 2. Run the Python subscriber app with Dapr: 
 
-<!-- STEP
-name: Run python subscriber
-expected_stdout_lines:
-  - '== APP == Subscriber received : 4'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-working_dir: ./order-processor
-background: true
-sleep: 10
--->
-
 ```bash
 dapr run --app-id order-processor-sdk --resources-path ../../../components/ --app-port 6001 -- uvicorn app:app --port 6002
 ```
 
-<!-- END_STEP -->
-
 ### Run Python message publisher with Dapr
 
 1. Install dependencies: 
 
-<!-- STEP
-name: Install python dependencies
--->
-
 ```bash
 cd ./checkout
 pip3 install -r requirements.txt 
 ```
-<!-- END_STEP -->
 
 2. Run the Python publisher app with Dapr: 
 
-<!-- STEP
-name: Run python publisher
-expected_stdout_lines:
-  - '== APP == INFO:root:Published data: {"orderId": 1}'
-  - '== APP == INFO:root:Published data: {"orderId": 2}'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-working_dir: ./checkout
-background: true
-sleep: 10
--->
-
 ```bash
 dapr run --app-id checkout-sdk --resources-path ../../../components/ -- python3 app.py
 ```
 
-<!-- END_STEP -->
+### Stop the apps and clean up
 
 ```bash
 dapr stop --app-id checkout-sdk
diff --git a/service_invocation/csharp/http/README.md b/service_invocation/csharp/http/README.md
index 54e65e2fd..f235865f8 100644
--- a/service_invocation/csharp/http/README.md
+++ b/service_invocation/csharp/http/README.md
@@ -27,13 +27,14 @@ expected_stdout_lines:
   - 'Validating config and starting app "checkout"'
   - 'Started Dapr with app id "checkout"'
   - 'Writing log files to directory'
-  - '== APP - order-processor == Order received : Order { orderId = 12 }'
-  - '== APP - checkout == Order passed: Order { OrderId = 12 }'
+  - '== APP - order-processor == Order received : Order { orderId = 10 }'
+  - '== APP - checkout == Order passed: Order { OrderId = 10 }'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
-timeout_seconds: 60
+timeout_seconds: 30
 -->
 
 ```bash
@@ -63,10 +64,6 @@ The terminal console output should look similar to this:
 == APP - checkout == Order passed: Order { OrderId = 9 }
 == APP - order-processor == Order received : Order { orderId = 10 }
 == APP - checkout == Order passed: Order { OrderId = 10 }
-== APP - order-processor == Order received : Order { orderId = 11 }
-== APP - checkout == Order passed: Order { OrderId = 11 }
-== APP - order-processor == Order received : Order { orderId = 12 }
-== APP - checkout == Order passed: Order { OrderId = 12 }
 ```
 
 2. Stop and clean up application processes
@@ -84,48 +81,22 @@ An alternative to running all or multiple applications at once is to run single
 
 1. Open a new terminal window and run the Dotnet order-processor app with Dapr: 
 
-<!-- STEP
-name: Run order-processor service
-expected_stdout_lines:
-  - '== APP == Order received : Order { orderId = 10 }'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 10
--->
-
 ```bash
 cd ./order-processor
 dapr run --app-port 7001 --app-id order-processor --app-protocol http --dapr-http-port 3501 -- dotnet run
 ```
 
-<!-- END_STEP -->
-
 ### Run .NET `checkout` with Dapr
 
 1. Open a new terminal and run the Dotnet checkout app with Dapr: 
 
-<!-- STEP
-name: Run checkout service
-expected_stdout_lines:
-  - '== APP == Order passed: Order { OrderId = 1 }'
-  - '== APP == Order passed: Order { OrderId = 2 }'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 10
-timeout_seconds: 60
--->
-
 ```bash
 cd ./checkout
 dapr run  --app-id checkout --app-protocol http --dapr-http-port 3500 -- dotnet run
 ```
-<!-- END_STEP -->
 
-2. Stop and clean up application processes
+### Stop and clean up application processes
 ```bash
 dapr stop --app-id order-processor
+dapr stop --app-id checkout
 ```
diff --git a/service_invocation/go/http/README.md b/service_invocation/go/http/README.md
index 2afd98103..3ab01e0ef 100644
--- a/service_invocation/go/http/README.md
+++ b/service_invocation/go/http/README.md
@@ -25,7 +25,7 @@ output_match_mode: substring
 match_order: none
 background: true
 sleep: 15
-timeout_seconds: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -72,18 +72,6 @@ An alternative to running all or multiple applications at once is to run single
 
 1. Run the order-processor app with Dapr in the `order-processor` folder:
 
-<!-- STEP
-name: Run order-processor service
-expected_stdout_lines:
-  - '== APP == Order received: {"orderId":10}'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 15
-timeout_seconds: 30
--->
-
 ```bash
 cd ./order-processor
 dapr run \
@@ -94,25 +82,10 @@ dapr run \
   -- go run .
 ```
 
-<!-- END_STEP -->
-
 ### Run Go checkout with Dapr
 
 1. Open a new terminal window and navigate to `checkout` directory, then run the Go checkout app with Dapr:
 
-<!-- STEP
-name: Run checkout service
-expected_stdout_lines:
-  - '== APP == Order passed: {"orderId":10}'
-  - '== APP == Order passed: {"orderId":11}'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 15
-timeout_seconds: 15
--->
-
 ```bash
 cd ./checkout
 dapr run \
@@ -121,9 +94,7 @@ dapr run \
   -- go run .
 ```
 
-<!-- END_STEP -->
-
-To stop:
+### Stop the apps and clean up
 
 ```bash
 dapr stop --app-id checkout
diff --git a/service_invocation/java/http/README.md b/service_invocation/java/http/README.md
index c8ebe20fc..6fa25dbd3 100644
--- a/service_invocation/java/http/README.md
+++ b/service_invocation/java/http/README.md
@@ -54,8 +54,10 @@ expected_stdout_lines:
   - 'Writing log files to directory'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -106,71 +108,33 @@ An alternative to running all or multiple applications at once is to run single
 
 1. Open a new terminal window and navigate to `order-processor` directory and install dependencies:
 
-<!-- STEP
-name: Install maven dependencies
--->
-
 ```bash
 cd ./order-processor
 mvn clean install
 ```
-<!-- END_STEP -->
 
 2. Run the Java order-processor app with Dapr:
 
-<!-- STEP
-name: Run Java order-processor service
-expected_stdout_lines:
-  - "== APP == Order received: 1"
-  - "== APP == Order received: 2"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 10
-working_dir: ./order-processor
--->
-
 ```bash
 dapr run --app-id order-processor --app-port 9001 --app-protocol http --dapr-http-port 3501 -- java -jar target/OrderProcessingService-0.0.1-SNAPSHOT.jar
 ```
 
-<!-- END_STEP -->
-
 ### Run Java checkout service with Dapr
 
 1. Open a new terminal window and navigate to `checkout` directory and install dependencies:
 
-<!-- STEP
-name: Install maven dependencies
--->
-
 ```bash
 cd ./checkout
 mvn clean install
 ```
-<!-- END_STEP -->
 
 2. Run the Java checkout app with Dapr:
 
-<!-- STEP
-name: Run Java checkout service
-expected_stdout_lines:
-  - "== APP == Order passed: 1"
-  - "== APP == Order passed: 2"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 15
-working_dir: ./checkout
--->
-
 ```bash
 dapr run --app-id checkout --app-protocol http --dapr-http-port 3500 -- java -jar target/CheckoutService-0.0.1-SNAPSHOT.jar
 ```
 
-<!-- END_STEP -->
-
-3. Stop and clean up application processes
+### Stop and clean up application processes
 
 ```bash
 dapr stop --app-id checkout
diff --git a/service_invocation/javascript/http/README.md b/service_invocation/javascript/http/README.md
index 90b4154d6..f33c79a01 100644
--- a/service_invocation/javascript/http/README.md
+++ b/service_invocation/javascript/http/README.md
@@ -45,8 +45,10 @@ expected_stdout_lines:
   - 'Writing log files to directory'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -98,74 +100,33 @@ An alternative to running all or multiple applications at once is to run single
 
 1. Open a new terminal window and navigate to `order-processor` directory and install dependencies: 
 
-<!-- STEP
-name: Install Node dependencies
--->
-
 ```bash
 cd ./order-processor
 npm install
 ```
 
-<!-- END_STEP -->
-
 3. Run the Node order-processor app with Dapr: 
 
-<!-- STEP
-name: Run order-processor service
-expected_stdout_lines:
-  - '== APP == Order received: { orderId: 10 }'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 15
-working_dir: ./order-processor
--->
-
 ```bash
 dapr run --app-port 5001 --app-id order-processor --app-protocol http --dapr-http-port 3501 -- npm start
 ```
 
-<!-- END_STEP -->
-
 ### Run Node checkout with Dapr
 
 1. Open a new terminal window and navigate to `checkout` directory and install dependencies: 
 
-<!-- STEP
-name: Install Node dependencies
--->
-
 ```bash
 cd ./checkout
 npm install
 ```
 
-<!-- END_STEP -->
-
 2. Run the Node checkout app with Dapr: 
 
-<!-- STEP
-name: Run checkout service
-expected_stdout_lines:
-  - '== APP == Order passed: {"orderId":1}'
-  - '== APP == Order passed: {"orderId":2}'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 15
-working_dir: ./checkout
--->
-    
 ```bash
 dapr run  --app-id checkout --app-protocol http --dapr-http-port 3500 -- npm start
 ```
 
-<!-- END_STEP -->
-
-3. Stop and clean up application processes
+### Stop and clean up application processes
 
 ```bash
 dapr stop --app-id checkout
diff --git a/service_invocation/python/http/README.md b/service_invocation/python/http/README.md
index 583095a92..989d2f3ba 100644
--- a/service_invocation/python/http/README.md
+++ b/service_invocation/python/http/README.md
@@ -44,8 +44,10 @@ expected_stdout_lines:
   - 'Writing log files to directory'
 expected_stderr_lines:
 output_match_mode: substring
+match_order: none
 background: true
 sleep: 15
+timeout_seconds: 30
 -->
 
 ```bash
@@ -102,74 +104,33 @@ An alternative to running all or multiple applications at once is to run single
 
 1. Install dependencies for `order-processor` app: 
 
-<!-- STEP
-name: Install Python dependencies
--->
-
 ```bash
 cd ./order-processor
 pip3 install -r requirements.txt
 ```
 
-<!-- END_STEP -->
-
 2. Run the Python order-processor app with Dapr: 
 
-<!-- STEP
-name: Run order-processor service
-expected_stdout_lines:
-  - '== APP == Order received : {"orderId": 10}'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 15
-working_dir: ./order-processor
--->
-
 ```bash
 dapr run --app-port 8001 --app-id order-processor --app-protocol http --dapr-http-port 3501 -- python3 app.py
 ```
 
-<!-- END_STEP -->
-
 ### Run Python checkout with Dapr
 
 1. Open a new terminal window and install dependencies for `checkout` app: 
 
-<!-- STEP
-name: Install Python dependencies
--->
-
 ```bash
 cd ./checkout
 pip3 install -r requirements.txt
 ```
 
-<!-- END_STEP -->
-
 2. Run the Python checkout app with Dapr: 
-
-<!-- STEP
-name: Run checkout service
-expected_stdout_lines:
-  - '== APP == Order passed: {"orderId": 1}'
-  - '== APP == Order passed: {"orderId": 2}'
-  - "Exited App successfully"
-expected_stderr_lines:
-output_match_mode: substring
-background: true
-sleep: 15
-working_dir: ./checkout
--->
-    
+   
 ```bash
 dapr run  --app-id checkout --app-protocol http --dapr-http-port 3500 -- python3 app.py
 ```
 
-<!-- END_STEP -->
-
-3. Stop and clean up application processes
+### Stop and clean up application processes
 
 ```bash
 dapr stop --app-id checkout