diff --git a/uitests/Reports_-_Follow_Add_App_Button.html b/uitests/Reports_-_Follow_Add_App_Button.html
index e556ef71..0c1b3bc5 100644
--- a/uitests/Reports_-_Follow_Add_App_Button.html
+++ b/uitests/Reports_-_Follow_Add_App_Button.html
@@ -31,7 +31,7 @@
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -49,7 +49,7 @@ Imported from: AT-AT CI - login-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -72,7 +72,7 @@ Imported from: AT-AT CI - login-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -94,7 +94,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -116,7 +116,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -138,7 +138,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -160,7 +160,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -182,7 +182,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -204,7 +204,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -226,7 +226,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -248,7 +248,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -270,7 +270,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -292,7 +292,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -314,7 +314,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -336,7 +336,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -358,7 +358,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -380,7 +380,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -402,7 +402,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -424,7 +424,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -446,7 +446,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -468,7 +468,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -490,7 +490,7 @@ Imported from: AT-AT CI - New Portfolio-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -511,7 +511,7 @@ Imported from: AT-AT CI - TO Step 1-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -519,20 +519,20 @@ Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state h3</td>
+<td>css=.sticky-cta-text h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state h3</td>
-<td>*Add approved task orders*</td>
+<td>css=.sticky-cta-text h3</td>
+<td>*Task Orders*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -553,7 +553,7 @@ Imported from: AT-AT CI - TO Step 1-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -574,7 +574,7 @@ Imported from: AT-AT CI - TO Step 1-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -595,7 +595,7 @@ Imported from: AT-AT CI - TO Step 1-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -616,7 +616,7 @@ Imported from: AT-AT CI - TO Step 1-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -633,7 +633,7 @@ This is Ghost Inspector flow control. The test will wait until the file is uploa
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -654,7 +654,7 @@ Imported from: AT-AT CI - TO Step 1-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -674,7 +674,7 @@ Imported from: AT-AT CI - TO Step 2-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -694,7 +694,7 @@ Imported from: AT-AT CI - TO Step 2-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -707,14 +707,14 @@ Imported from: AT-AT CI - TO Step 2-->
 <tr>
 <td>type</td>
 <td>css=#number</td>
-<td>1234567890123</td>
+<td>${timestamp}</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3
@@ -734,7 +734,7 @@ Imported from: AT-AT CI - TO Step 2-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -753,7 +753,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -772,7 +772,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -791,7 +791,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -810,7 +810,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -829,7 +829,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -848,7 +848,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -867,7 +867,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -886,7 +886,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -905,7 +905,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -924,7 +924,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -943,7 +943,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -962,7 +962,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -981,7 +981,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -1000,7 +1000,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -1019,7 +1019,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -1038,7 +1038,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -1057,7 +1057,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4
 Imported from: AT-AT CI - TO Step 3-->
@@ -1076,7 +1076,7 @@ Imported from: AT-AT CI - TO Step 3-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4-->
 <tr>
@@ -1094,7 +1094,7 @@ Imported from: AT-AT CI - TO Step 4-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4-->
 <tr>
@@ -1112,7 +1112,7 @@ Imported from: AT-AT CI - TO Step 4-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4-->
 <tr>
@@ -1130,7 +1130,7 @@ Imported from: AT-AT CI - TO Step 4-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4-->
 <tr>
@@ -1148,7 +1148,7 @@ Imported from: AT-AT CI - TO Step 4-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4-->
 <tr>
@@ -1157,16 +1157,16 @@ Imported from: AT-AT CI - TO Step 4-->
 <td></td>
 </tr>
 <tr>
-<td>assertText</td>
+<td>assertElementPresent</td>
 <td>css=.col.task-order__details > div:nth-of-type(2)</td>
-<td>*1234567890123*</td>
+<td></td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5
 Imported from: AT-AT CI - TO Step 4-->
 <tr>
@@ -1184,7 +1184,7 @@ Imported from: AT-AT CI - TO Step 4-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5-->
 <tr>
 <td>waitForElementPresent</td>
@@ -1201,7 +1201,7 @@ Imported from: AT-AT CI - TO Step 5-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5-->
 <tr>
 <td>waitForElementPresent</td>
@@ -1218,7 +1218,7 @@ Imported from: AT-AT CI - TO Step 5-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5-->
 <tr>
 <td>waitForElementPresent</td>
@@ -1235,19 +1235,7 @@ Imported from: AT-AT CI - TO Step 5-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
-Imported from: AT-AT CI - TO Step 5-->
-<tr>
-<td>captureEntirePageScreenshot</td>
-<td></td>
-<td></td>
-</tr>
-<tr>
-<td>waitForPageToLoad</td>
-<td></td>
-<td></td>
-</tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5-->
 <tr>
 <td>waitForElementPresent</td>
@@ -1264,7 +1252,24 @@ Imported from: AT-AT CI - TO Step 5-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary
+<!--Imported from: AT-AT CI - Report Basics
+Imported from: AT-AT CI - TO Step 5-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=h3.usa-alert-heading</td>
+<td></td>
+</tr>
+<tr>
+<td>assertText</td>
+<td>css=h3.usa-alert-heading</td>
+<td>*Your Task Order has been uploaded successfully.*</td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - Report Basics
 Imported from: AT-AT CI - TO Step 5-->
 <tr>
 <td>waitForElementPresent</td>
@@ -1281,7 +1286,41 @@ Imported from: AT-AT CI - TO Step 5-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary-->
+<!--Imported from: AT-AT CI - Report Basics
+Imported from: AT-AT CI - TO Step 5-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.portfolio-funding</td>
+<td></td>
+</tr>
+<tr>
+<td>assertElementPresent</td>
+<td>css=.portfolio-funding</td>
+<td></td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - Report Basics
+Imported from: AT-AT CI - TO Step 5-->
+<tr>
+<td>waitForElementPresent</td>
+<td>css=.action-group</td>
+<td></td>
+</tr>
+<tr>
+<td>assertElementPresent</td>
+<td>css=.action-group</td>
+<td></td>
+</tr>
+<tr>
+<td>waitForPageToLoad</td>
+<td></td>
+<td></td>
+</tr>
+<!--Imported from: AT-AT CI - Report Basics-->
 <tr>
 <td>waitForElementPresent</td>
 <td>css=.icon.icon--chart-pie > svg</td>
@@ -1297,7 +1336,7 @@ Imported from: AT-AT CI - TO Step 5-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary-->
+<!--Imported from: AT-AT CI - Report Basics-->
 <tr>
 <td>waitForElementPresent</td>
 <td>css=.sticky-cta-text > h3</td>
@@ -1313,7 +1352,7 @@ Imported from: AT-AT CI - TO Step 5-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary-->
+<!--Imported from: AT-AT CI - Report Basics-->
 <tr>
 <td>waitForElementPresent</td>
 <td>css=.row > .col.col--grow.reporting-summary-item:nth-of-type(1) > .reporting-summary-item__value</td>
@@ -1329,7 +1368,7 @@ Imported from: AT-AT CI - TO Step 5-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary-->
+<!--Imported from: AT-AT CI - Report Basics-->
 <tr>
 <td>waitForElementPresent</td>
 <td>css=.row > .col.col--grow.reporting-summary-item:nth-of-type(2) > .reporting-summary-item__value</td>
@@ -1347,7 +1386,7 @@ Imported from: AT-AT CI - TO Step 5-->
 <td></td>
 <td></td>
 </tr>
-<!--Imported from: AT-AT CI - Report Summary-->
+<!--Imported from: AT-AT CI - Report Basics-->
 <tr>
 <td>waitForElementPresent</td>
 <td>css=.row > .col.col--grow.reporting-summary-item:nth-of-type(3) > h5.reporting-summary-item__header > .reporting-summary-item__header-text</td>
diff --git a/uitests/TO_Step_3.html b/uitests/TO_Step_3.html
index 346d68b3..08a12033 100644
--- a/uitests/TO_Step_3.html
+++ b/uitests/TO_Step_3.html
@@ -427,13 +427,13 @@ Imported from: AT-AT CI - TO Step 1-->
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state h3</td>
+<td>css=.sticky-cta-text h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state h3</td>
-<td>*Add approved task orders*</td>
+<td>css=.sticky-cta-text h3</td>
+<td>*Task Orders*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -579,7 +579,7 @@ Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>type</td>
 <td>css=#number</td>
-<td>1234567890123</td>
+<td>${timestamp}</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
diff --git a/uitests/TO_Step_3_-_Add_CLIN.html b/uitests/TO_Step_3_-_Add_CLIN.html
index d7ec07cf..c9230826 100644
--- a/uitests/TO_Step_3_-_Add_CLIN.html
+++ b/uitests/TO_Step_3_-_Add_CLIN.html
@@ -450,13 +450,13 @@ Imported from: AT-AT CI - TO Step 2
 Imported from: AT-AT CI - TO Step 1-->
 <tr>
 <td>waitForElementPresent</td>
-<td>css=.empty-state h3</td>
+<td>css=.sticky-cta-text h3</td>
 <td></td>
 </tr>
 <tr>
 <td>assertText</td>
-<td>css=.empty-state h3</td>
-<td>*Add approved task orders*</td>
+<td>css=.sticky-cta-text h3</td>
+<td>*Task Orders*</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>
@@ -611,7 +611,7 @@ Imported from: AT-AT CI - TO Step 2-->
 <tr>
 <td>type</td>
 <td>css=#number</td>
-<td>1234567890123</td>
+<td>${timestamp}</td>
 </tr>
 <tr>
 <td>waitForPageToLoad</td>