diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeTestChatItems.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeTestChatItems.kt
index 4ed35e3506..6acf14cd97 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeTestChatItems.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeTestChatItems.kt
@@ -29,6 +29,18 @@ val cancelTestGenButton = Button(
     icon = "cancel"
 )
 
+val cancelTestGenBuildAndExecuteButton = Button(
+    id = CodeTestButtonId.StopTestGenBuildAndExecution.id,
+    text = message("general.cancel"),
+    icon = "cancel"
+)
+
+val cancelFixingTestCasesButton = Button(
+    id = CodeTestButtonId.StopFixingTestCases.id,
+    text = message("general.cancel"),
+    icon = "cancel"
+)
+
 fun testGenProgressField(value: Int) = ProgressField(
     status = "default",
     text = message("testgen.progressbar.generate_unit_tests"),
@@ -36,3 +48,17 @@ fun testGenProgressField(value: Int) = ProgressField(
     valueText = "$value%",
     actions = listOf(cancelTestGenButton)
 )
+
+val fixingTestCasesProgressField = ProgressField(
+    status = "default",
+    value = -1,
+    text = message("testgen.progressbar.fixing_test_cases"),
+    actions = listOf(cancelTestGenBuildAndExecuteButton)
+)
+
+fun createProgressField(messageKey: String): ProgressField = ProgressField(
+    status = "default",
+    value = -1,
+    text = message(messageKey),
+    actions = listOf(if (messageKey == "testgen.progressbar.build_and_execute") cancelTestGenBuildAndExecuteButton else cancelFixingTestCasesButton)
+)
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
index 8b02c019c2..2c039665f6 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
@@ -36,8 +36,9 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.CodeTes
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.model.PreviousUTGIterationContext
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.model.ShortAnswer
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.BuildAndExecuteProgressStatus
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.BuildStatus
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.Session
-import software.aws.toolkits.jetbrains.services.amazonqCodeTest.utils.combineBuildAndExecuteLogFiles
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.utils.constructBuildAndExecutionSummaryText
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.calculateTotalLatency
 import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.CodeTestException
 import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.fileTooLarge
@@ -55,6 +56,7 @@ import software.aws.toolkits.jetbrains.utils.isQConnected
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.telemetry.Status
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
@@ -63,6 +65,7 @@ import java.nio.file.Path
 import java.nio.file.Paths
 import java.time.Duration
 import java.time.Instant
+import java.util.UUID
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.zip.ZipInputStream
 
@@ -87,13 +90,15 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
     ) {
         // 1st API call: Zip project and call CreateUploadUrl
         val session = codeTestChatHelper.getActiveSession()
-        session.isGeneratingTests = true
-        session.iteration++
+        if (session.testGenerationJobGroupName.isEmpty()) {
+            session.testGenerationJobGroupName = UUID.randomUUID().toString()
+        }
 
-        // Set the Progress bar to "Generating unit tests..."
         codeTestChatHelper.updateUI(
             promptInputDisabledState = true,
-            promptInputProgress = testGenProgressField(0),
+            promptInputProgress = session.listOfTestGenerationJobId.takeUnless { it.isEmpty() }
+                ?.let { fixingTestCasesProgressField }
+                ?: testGenProgressField(0)
         )
 
         val codeTestResponseContext = createUploadUrl(codeTestChatHelper, previousIterationContext)
@@ -105,7 +110,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
             fileTooLarge()
         }
 
-        val createUploadUrlResponse = codeTestResponseContext.createUploadUrlResponse ?: return
+        val createUploadUrlResponse = codeTestResponseContext.createUploadUrlResponse
         throwIfCancelled(session)
 
         LOG.debug {
@@ -137,7 +142,8 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                                 )
                                 .build()
                         ),
-                        userInput = prompt
+                        userInput = prompt,
+                        testGenerationJobGroupName = session.testGenerationJobGroupName
                     )
                     delay(200)
                     response?.testGenerationJob() != null
@@ -166,11 +172,12 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
         session.startTestGenerationRequestId = startTestGenerationResponse.responseMetadata().requestId()
         session.testGenerationJobGroupName = job.testGenerationJobGroupName()
         session.testGenerationJob = job.testGenerationJobId()
+        session.listOfTestGenerationJobId += job.testGenerationJobId()
         throwIfCancelled(session)
 
         // 3rd API call: Step 3:  Polling mechanism on test job status with getTestGenStatus getTestGeneration
         var finished = false
-        var testGenerationResponse: GetTestGenerationResponse? = null
+        var testGenerationResponse: GetTestGenerationResponse?
 
         var shortAnswer = ShortAnswer()
         LOG.debug {
@@ -198,6 +205,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     // Setting default value to 0 if the value is null or invalid
                     session.numberOfUnitTestCasesGenerated = shortAnswer.numberOfTestMethods
                     session.testFileRelativePathToProjectRoot = getTestFilePathRelativeToRoot(shortAnswer)
+                    session.shortAnswer = shortAnswer
 
                     // update test summary card in success case
                     if (previousIterationContext == null) {
@@ -261,10 +269,13 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 }
                 codeTestChatHelper.updateUI(
                     promptInputDisabledState = true,
-                    promptInputProgress = testGenProgressField(progressRate),
+                    promptInputProgress = when (session.listOfTestGenerationJobId.size) {
+                        1 -> testGenProgressField(progressRate)
+                        else -> createProgressField("testgen.progressbar.fixing_test_cases")
+                    }
                 )
             }
-
+            throwIfCancelled(session)
             // polling every 2 seconds to reduce # of API calls
             delay(2000)
         }
@@ -291,10 +302,10 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 LOG.info { "ExportResultArchive latency: ${calculateTotalLatency(startTime, Instant.now())}" }
             }
         )
+        throwIfCancelled(session)
         val result = byteArray.reduce { acc, next -> acc + next } // To map the result it is needed to combine the  full byte array
         storeGeneratedTestDiffs(result, session)
         if (!session.isGeneratingTests) {
-            // TODO: Modify text according to FnF
             codeTestChatHelper.addAnswer(
                 CodeTestChatMessageContent(
                     message = message("testgen.error.generic_technical_error_message"),
@@ -324,6 +335,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 )
             )
         } else {
+            throwIfCancelled(session)
             if (previousIterationContext == null) {
                 // show another card as the answer
                 val viewDiffMessageId = codeTestChatHelper.addAnswer(
@@ -342,17 +354,18 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 session.viewDiffMessageId = viewDiffMessageId
                 codeTestChatHelper.updateUI(
                     promptInputDisabledState = false,
-                    promptInputPlaceholder = "Specify a function(s) in the current file(optional)",
                     promptInputProgress = testGenCompletedField,
                 )
             } else {
+                val updatedText = constructBuildAndExecutionSummaryText(BuildAndExecuteProgressStatus.PROCESS_TEST_RESULTS, codeTestChatHelper)
                 codeTestChatHelper.updateAnswer(
                     CodeTestChatMessageContent(
                         type = ChatMessageType.Answer,
                         buttons = listOf(Button("utg_view_diff", "View Diff", keepCardAfterClick = true, position = "outside", status = "info")),
                         fileList = listOf(getTestFilePathRelativeToRoot(shortAnswer)),
                         projectRootName = project.name,
-                        codeReference = codeReference
+                        codeReference = codeReference,
+                        message = updatedText
                     ),
                     messageIdOverride = previousIterationContext.buildAndExecuteMessageId
                 )
@@ -366,6 +379,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 promptInputPlaceholder = message("testgen.placeholder.view_diff"),
                 promptInputProgress = testGenCompletedField,
             )
+            throwIfCancelled(session)
             delay(1000)
         }
 
@@ -468,12 +482,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
             } else {
                 previousIterationContext.selectedFile
             }
-
-        val combinedBuildAndExecuteLogFile = combineBuildAndExecuteLogFiles(
-            previousIterationContext?.buildLogFile,
-            previousIterationContext?.testLogFile
-        )
-        val codeTestSessionConfig = CodeTestSessionConfig(file, project, combinedBuildAndExecuteLogFile)
+        val codeTestSessionConfig = CodeTestSessionConfig(file, project, previousIterationContext?.buildLogFile)
         codeTestChatHelper.getActiveSession().projectRoot = codeTestSessionConfig.projectRoot.path
 
         val codeTestSessionContext = CodeTestSessionContext(project, codeTestSessionConfig)
@@ -481,8 +490,13 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
         return codeWhispererCodeTestSession.run(codeTestChatHelper, previousIterationContext)
     }
 
-    private fun startTestGeneration(uploadId: String, targetCode: List<TargetCode>, userInput: String): StartTestGenerationResponse =
-        CodeWhispererClientAdaptor.getInstance(project).startTestGeneration(uploadId, targetCode, userInput)
+    private fun startTestGeneration(
+        uploadId: String,
+        targetCode: List<TargetCode>,
+        userInput: String,
+        testGenerationJobGroupName: String,
+    ): StartTestGenerationResponse =
+        CodeWhispererClientAdaptor.getInstance(project).startTestGeneration(uploadId, targetCode, userInput, testGenerationJobGroupName)
 
     private fun getTestGenerationStatus(jobId: String, jobGroupName: String): GetTestGenerationResponse =
         CodeWhispererClientAdaptor.getInstance(project).getTestGeneration(jobId, jobGroupName)
@@ -539,7 +553,10 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
             session.conversationState = ConversationState.IDLE
             return null
         }
-
+        if (session.buildStatus === BuildStatus.CANCELLED) {
+            session.conversationState = ConversationState.IDLE
+            return null
+        }
         beforeTestGenFlow(session)
 
         return cs.launch {
@@ -566,28 +583,48 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                         canBeVoted = false
                     )
                 )
-
-                AmazonqTelemetry.utgGenerateTests(
-                    cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
-                    hasUserPromptSupplied = session.hasUserPromptSupplied,
-                    isFileInWorkspace = true,
-                    isSupportedLanguage = true,
-                    credentialStartUrl = getStartUrl(project),
-                    jobGroup = session.testGenerationJobGroupName,
-                    jobId = session.testGenerationJob,
-                    result = if (e.message == message("testgen.message.cancelled")) MetricResult.Cancelled else MetricResult.Failed,
-                    reason = (e as CodeTestException).code ?: "DefaultError",
-                    reasonDesc = if (e.message == message("testgen.message.cancelled")) "${e.code}: ${e.message}" else e.message,
-                    perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
-                    isCodeBlockSelected = session.isCodeBlockSelected,
-                    artifactsUploadDuration = session.artifactUploadDuration,
-                    buildPayloadBytes = session.srcPayloadSize,
-                    buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
-                )
+                if (session.listOfTestGenerationJobId.size < 2) {
+                    AmazonqTelemetry.utgGenerateTests(
+                        cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                        hasUserPromptSupplied = session.hasUserPromptSupplied,
+                        isFileInWorkspace = true,
+                        isSupportedLanguage = true,
+                        credentialStartUrl = getStartUrl(project),
+                        jobGroup = session.testGenerationJobGroupName,
+                        jobId = session.testGenerationJob,
+                        result = if (e.message == message("testgen.message.cancelled")) MetricResult.Cancelled else MetricResult.Failed,
+                        reason = (e as CodeTestException).code ?: "DefaultError",
+                        reasonDesc = if (e.message == message("testgen.message.cancelled")) "${e.code}: ${e.message}" else e.message,
+                        perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
+                        isCodeBlockSelected = session.isCodeBlockSelected,
+                        artifactsUploadDuration = session.artifactUploadDuration,
+                        buildPayloadBytes = session.srcPayloadSize,
+                        buildZipFileBytes = session.srcZipFileSize,
+                        requestId = session.startTestGenerationRequestId
+                    )
+                } else {
+                    AmazonqTelemetry.unitTestGeneration(
+                        cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                        hasUserPromptSupplied = session.hasUserPromptSupplied,
+                        isSupportedLanguage = true,
+                        credentialStartUrl = getStartUrl(project),
+                        jobGroup = session.testGenerationJobGroupName,
+                        jobId = session.testGenerationJob,
+                        result = if (e.message == message("testgen.message.cancelled")) MetricResult.Cancelled else MetricResult.Failed,
+                        reason = (e as CodeTestException).code ?: "DefaultError",
+                        reasonDesc = if (e.message == message("testgen.message.cancelled")) "${e.code}: ${e.message}" else e.message,
+                        perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
+                        isCodeBlockSelected = session.isCodeBlockSelected,
+                        artifactsUploadDuration = session.artifactUploadDuration,
+                        buildZipFileBytes = session.srcZipFileSize,
+                        requestId = session.startTestGenerationRequestId,
+                        status = if (e.message == message("testgen.message.cancelled")) Status.CANCELLED else Status.FAILED,
+                    )
+                }
                 session.isGeneratingTests = false
             } finally {
                 // Reset the flow if there is any error
+                codeTestChatHelper.sendUpdatePromptProgress(session.tabId, null)
                 if (!session.isGeneratingTests) {
                     codeTestChatHelper.updateUI(
                         promptInputProgress = cancellingProgressField
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
index 2807e2cf9c..04706be77d 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -53,6 +53,7 @@ import software.aws.toolkits.jetbrains.core.AwsClientManager
 import software.aws.toolkits.jetbrains.core.coroutines.EDT
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
+import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
 import software.aws.toolkits.jetbrains.services.amazonq.project.RelevantDocument
@@ -60,14 +61,19 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeTest.CodeWhispererUTG
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.ConversationState
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.FEATURE_NAME
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.InboundAppMessagesHandler
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.cancellingProgressField
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.createProgressField
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.Button
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.CodeTestChatMessage
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.CodeTestChatMessageContent
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.IncomingCodeTestMessage
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.model.PreviousUTGIterationContext
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.BuildAndExecuteProgressStatus
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.BuildStatus
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.Session
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.UTG_CHAT_MAX_ITERATION
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.storage.ChatSessionStorage
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.testGenCompletedField
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.utils.constructBuildAndExecutionSummaryText
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.utils.runBuildOrTestCommand
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendAuthNeededException
@@ -98,6 +104,7 @@ import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.FeatureId
 import software.aws.toolkits.telemetry.InteractionType
 import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.telemetry.Status
 import software.aws.toolkits.telemetry.UiTelemetry
 import java.io.File
 import java.nio.file.Files
@@ -167,6 +174,7 @@ class CodeTestChatController(
     override suspend fun processStartTestGen(message: IncomingCodeTestMessage.StartTestGen) {
         codeTestChatHelper.setActiveCodeTestTabId(message.tabId)
         val session = codeTestChatHelper.getActiveSession()
+        sessionCleanUp(message.tabId)
         // check if IDE has active file open, yes return (fileName and filePath) else return null
         val project = context.project
         val fileInfo = checkActiveFileInIDE(project, message) ?: return
@@ -175,13 +183,6 @@ class CodeTestChatController(
             return
         }
         session.startTimeOfTestGeneration = Instant.now().toEpochMilli().toDouble()
-        session.isGeneratingTests = true
-
-        var requestId: String = ""
-        var statusCode: Int = 0
-        var conversationId: String? = null
-        var testResponseMessageId: String? = null
-        var testResponseText: String = ""
 
         val userMessage = when {
             message.prompt != "" -> {
@@ -217,6 +218,11 @@ class CodeTestChatController(
             CodeWhispererUTGChatManager.getInstance(project).generateTests(userPrompt, codeTestChatHelper, null, selectionRange)
         } else {
             // Not adding a progress bar to unsupported language cases
+            var requestId: String = ""
+            var statusCode: Int = 0
+            var conversationId: String? = null
+            var testResponseMessageId: String? = null
+            var testResponseText: String = ""
             val responseHandler = GenerateAssistantResponseResponseHandler.builder()
                 .onResponse {
                     requestId = it.responseMetadata().requestId()
@@ -310,7 +316,8 @@ class CodeTestChatController(
                     credentialStartUrl = getStartUrl(project),
                     result = MetricResult.Succeeded,
                     perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
-                    requestId = id
+                    requestId = id,
+                    status = Status.ACCEPTED
                 )
             }
             session.isGeneratingTests = false
@@ -563,7 +570,13 @@ class CodeTestChatController(
                     session.linesOfCodeGenerated = lineDifference.coerceAtLeast(0)
                     session.charsOfCodeGenerated = charDifference.coerceAtLeast(0)
                     session.latencyOfTestGeneration = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration)
-                    UiTelemetry.click(null as Project?, "unitTestGeneration_viewDiff")
+                    UiTelemetry.click(
+                        context.project,
+                        when (session.listOfTestGenerationJobId.size) {
+                            1 -> "unitTestGeneration_viewDiff"
+                            else -> "unitTestGeneration_viewDiff_Iteration"
+                        }
+                    )
 
                     val buttonList = mutableListOf<Button>()
                     buttonList.add(
@@ -575,21 +588,6 @@ class CodeTestChatController(
                             status = "error",
                         ),
                     )
-                    /*
-                    // TODO: for unit test regeneration loop
-                    if (session.iteration < 2) {
-                        buttonList.add(
-                            Button(
-                                "utg_regenerate",
-                                "Regenerate",
-                                keepCardAfterClick = true,
-                                position = "outside",
-                                status = "info",
-                            ),
-                        )
-                    }
-                     */
-
                     buttonList.add(
                         Button(
                             "utg_accept",
@@ -617,6 +615,8 @@ class CodeTestChatController(
             "utg_accept" -> {
                 // open the file at test path relative to the project root
                 val testFileAbsolutePath = Paths.get(session.projectRoot, session.testFileRelativePathToProjectRoot)
+                val startUrl = getStartUrl(context.project)
+                val isInternalUser = isInternalUser(startUrl)
                 openOrCreateTestFileAndApplyDiff(context.project, testFileAbsolutePath, session.generatedTestDiffs.values.first(), session.openedDiffFile)
                 session.codeReferences?.let { references ->
                     LOG.debug { "Accepted unit tests with references: $references" }
@@ -643,64 +643,73 @@ class CodeTestChatController(
                         }
                     }
                 }
-                val testGenerationEventResponse = client.sendTestGenerationEvent(
-                    session.testGenerationJob,
-                    session.testGenerationJobGroupName,
-                    session.programmingLanguage,
-                    IdeCategory.JETBRAINS,
-                    session.numberOfUnitTestCasesGenerated,
-                    session.numberOfUnitTestCasesGenerated,
-                    session.linesOfCodeGenerated,
-                    session.linesOfCodeGenerated,
-                    session.charsOfCodeGenerated,
-                    session.charsOfCodeGenerated
+
+                UiTelemetry.click(
+                    context.project,
+                    when (session.listOfTestGenerationJobId.size) {
+                        1 -> "unitTestGeneration_acceptDiff"
+                        else -> "unitTestGeneration_acceptDiff_Iteration"
+                    }
                 )
-                LOG.debug {
-                    "Successfully sent test generation telemetry. RequestId: ${
-                        testGenerationEventResponse.responseMetadata().requestId()}"
-                }
 
-                UiTelemetry.click(null as Project?, "unitTestGeneration_acceptDiff")
+                if (session.listOfTestGenerationJobId.size == 1) {
+                    val testGenerationEventResponse = client.sendTestGenerationEvent(
+                        session.testGenerationJob,
+                        session.testGenerationJobGroupName,
+                        session.programmingLanguage,
+                        IdeCategory.JETBRAINS,
+                        session.numberOfUnitTestCasesGenerated,
+                        session.numberOfUnitTestCasesGenerated,
+                        session.linesOfCodeGenerated,
+                        session.linesOfCodeGenerated,
+                        session.charsOfCodeGenerated,
+                        session.charsOfCodeGenerated
+                    )
+                    LOG.debug {
+                        "Successfully sent test generation telemetry. RequestId: ${
+                            testGenerationEventResponse.responseMetadata().requestId()}"
+                    }
+                    AmazonqTelemetry.utgGenerateTests(
+                        cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                        hasUserPromptSupplied = session.hasUserPromptSupplied,
+                        isFileInWorkspace = true,
+                        isSupportedLanguage = true,
+                        credentialStartUrl = getStartUrl(project = context.project),
+                        jobGroup = session.testGenerationJobGroupName,
+                        jobId = session.testGenerationJob,
+                        acceptedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
+                        generatedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
+                        acceptedLinesCount = session.linesOfCodeGenerated?.toLong(),
+                        generatedLinesCount = session.linesOfCodeGenerated?.toLong(),
+                        acceptedCharactersCount = session.charsOfCodeGenerated?.toLong(),
+                        generatedCharactersCount = session.charsOfCodeGenerated?.toLong(),
+                        result = MetricResult.Succeeded,
+                        perfClientLatency = session.latencyOfTestGeneration,
+                        isCodeBlockSelected = session.isCodeBlockSelected,
+                        artifactsUploadDuration = session.artifactUploadDuration,
+                        buildPayloadBytes = session.srcPayloadSize,
+                        buildZipFileBytes = session.srcZipFileSize,
+                        requestId = session.startTestGenerationRequestId,
+                        status = Status.ACCEPTED
+                    )
+                }
 
-                AmazonqTelemetry.utgGenerateTests(
-                    cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
-                    hasUserPromptSupplied = session.hasUserPromptSupplied,
-                    isFileInWorkspace = true,
-                    isSupportedLanguage = true,
-                    credentialStartUrl = getStartUrl(project = context.project),
-                    jobGroup = session.testGenerationJobGroupName,
-                    jobId = session.testGenerationJob,
-                    acceptedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
-                    generatedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
-                    acceptedLinesCount = session.linesOfCodeGenerated?.toLong(),
-                    generatedLinesCount = session.linesOfCodeGenerated?.toLong(),
-                    acceptedCharactersCount = session.charsOfCodeGenerated?.toLong(),
-                    generatedCharactersCount = session.charsOfCodeGenerated?.toLong(),
-                    result = MetricResult.Succeeded,
-                    perfClientLatency = session.latencyOfTestGeneration,
-                    isCodeBlockSelected = session.isCodeBlockSelected,
-                    artifactsUploadDuration = session.artifactUploadDuration,
-                    buildPayloadBytes = session.srcPayloadSize,
-                    buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
-                )
-                codeTestChatHelper.addAnswer(
-                    CodeTestChatMessageContent(
-                        message = message("testgen.message.success"),
-                        type = ChatMessageType.Answer,
-                        canBeVoted = false
+                if (!isInternalUser) {
+                    codeTestChatHelper.addAnswer(
+                        CodeTestChatMessageContent(
+                            message = message("testgen.message.success"),
+                            type = ChatMessageType.Answer,
+                            canBeVoted = false
+                        )
                     )
-                )
-                sessionCleanUp(session.tabId)
-                codeTestChatHelper.updateUI(
-                    promptInputDisabledState = false,
-                    promptInputPlaceholder = message("testgen.placeholder.enter_slash_quick_actions"),
-                )
-                /*
+                    sessionCleanUp(message.tabId)
+                    return
+                }
+
                 val taskContext = session.buildAndExecuteTaskContext
-                if (session.iteration < 2) {
-                    taskContext.buildCommand = getBuildCommand(message.tabId)
-                    taskContext.executionCommand = getExecutionCommand(message.tabId)
+                if (session.listOfTestGenerationJobId.size < 2) {
+                    taskContext.buildCommand = codeTestChatHelper.getSession(message.tabId).shortAnswer.buildCommand.toString()
+
                     codeTestChatHelper.addAnswer(
                         CodeTestChatMessageContent(
                             message = """
@@ -708,7 +717,6 @@ class CodeTestChatController(
 
                            ```sh
                            ${taskContext.buildCommand}
-                           ${taskContext.executionCommand}
                            ```
                             """.trimIndent(),
                             type = ChatMessageType.Answer,
@@ -740,10 +748,11 @@ class CodeTestChatController(
                     )
                     codeTestChatHelper.updateUI(
                         promptInputDisabledState = true,
+                        promptInputPlaceholder = message("testgen.placeholder.select_an_action_to_proceed"),
                     )
-                } else if (session.iteration < 4) {
+                } else if (session.listOfTestGenerationJobId.size < 4) {
                     // Already built and executed once, display # of iterations left message
-                    val remainingIterationsCount = UTG_CHAT_MAX_ITERATION - session.iteration
+                    val remainingIterationsCount = UTG_CHAT_MAX_ITERATION - session.listOfTestGenerationJobId.size
                     val iterationCountString = "$remainingIterationsCount ${if (remainingIterationsCount > 1) "iterations" else "iteration"}"
                     codeTestChatHelper.addAnswer(
                         CodeTestChatMessageContent(
@@ -774,14 +783,14 @@ class CodeTestChatController(
                     )
                     codeTestChatHelper.updateUI(
                         promptInputDisabledState = true,
+                        promptInputPlaceholder = message("testgen.placeholder.waiting_on_your_inputs"),
                     )
                 } else {
                     // TODO: change this hardcoded string
-                    val monthlyLimitString = "25 out of 30"
                     codeTestChatHelper.addAnswer(
                         CodeTestChatMessageContent(
                             message = """
-                                 You have gone through all three iterations and this unit test generation workflow is complete. You have $monthlyLimitString Amazon Q Developer Agent invocations left this month.
+                                 You have gone through both iterations and this unit test generation workflow is complete.
                             """.trimIndent(),
                             type = ChatMessageType.Answer,
                         )
@@ -789,11 +798,33 @@ class CodeTestChatController(
                     codeTestChatHelper.updateUI(
                         promptInputPlaceholder = message("testgen.placeholder.newtab")
                     )
+                    AmazonqTelemetry.unitTestGeneration(
+                        count = session.listOfTestGenerationJobId.size.toLong() - 1,
+                        cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                        hasUserPromptSupplied = session.hasUserPromptSupplied,
+                        isSupportedLanguage = true,
+                        credentialStartUrl = getStartUrl(project = context.project),
+                        jobGroup = session.testGenerationJobGroupName,
+                        jobId = session.testGenerationJob,
+                        acceptedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
+                        generatedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
+                        acceptedLinesCount = session.linesOfCodeGenerated?.toLong(),
+                        generatedLinesCount = session.linesOfCodeGenerated?.toLong(),
+                        acceptedCharactersCount = session.charsOfCodeGenerated?.toLong(),
+                        generatedCharactersCount = session.charsOfCodeGenerated?.toLong(),
+                        result = MetricResult.Failed,
+                        perfClientLatency = session.latencyOfTestGeneration,
+                        isCodeBlockSelected = session.isCodeBlockSelected,
+                        artifactsUploadDuration = session.artifactUploadDuration,
+                        buildZipFileBytes = session.srcZipFileSize,
+                        requestId = session.startTestGenerationRequestId,
+                        update = session.updateBuildCommands,
+                        status = Status.ACCEPTED
+                    )
                 }
-                 */
             }
-            /*
-            //TODO: this is for unit test regeneration build iteration loop
+
+            // TODO: this is for unit test regeneration build iteration loop
             "utg_regenerate" -> {
                 // close the existing open diff in the editor.
                 ApplicationManager.getApplication().invokeLater {
@@ -810,6 +841,7 @@ class CodeTestChatController(
                     session.testGenerationJob,
                     session.testGenerationJobGroupName,
                     session.programmingLanguage,
+                    IdeCategory.JETBRAINS,
                     session.numberOfUnitTestCasesGenerated,
                     0,
                     session.linesOfCodeGenerated,
@@ -821,13 +853,11 @@ class CodeTestChatController(
                     "Successfully sent test generation telemetry. RequestId: ${
                         testGenerationEventResponse.responseMetadata().requestId()}"
                 }
-                sessionCleanUp(session.tabId)
                 codeTestChatHelper.updateUI(
                     promptInputDisabledState = false,
                     promptInputPlaceholder = message("testgen.placeholder.waiting_on_your_inputs"),
                 )
             }
-             */
 
             "utg_reject" -> {
                 ApplicationManager.getApplication().invokeLater {
@@ -856,39 +886,101 @@ class CodeTestChatController(
                     "Successfully sent test generation telemetry. RequestId: ${
                         testGenerationEventResponse.responseMetadata().requestId()}"
                 }
+                UiTelemetry.click(
+                    context.project,
+                    when (session.listOfTestGenerationJobId.size) {
+                        1 -> "unitTestGeneration_rejectDiff"
+                        else -> "unitTestGeneration_rejectDiff_Iteration"
+                    }
+                )
+                if (session.listOfTestGenerationJobId.size == 1) {
+                    AmazonqTelemetry.utgGenerateTests(
+                        cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                        hasUserPromptSupplied = session.hasUserPromptSupplied,
+                        isFileInWorkspace = true,
+                        isSupportedLanguage = true,
+                        credentialStartUrl = getStartUrl(project = context.project),
+                        jobGroup = session.testGenerationJobGroupName,
+                        jobId = session.testGenerationJob,
+                        acceptedCount = 0,
+                        generatedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
+                        acceptedLinesCount = 0,
+                        generatedLinesCount = session.linesOfCodeGenerated?.toLong(),
+                        acceptedCharactersCount = 0,
+                        generatedCharactersCount = session.charsOfCodeGenerated?.toLong(),
+                        result = MetricResult.Succeeded,
+                        perfClientLatency = session.latencyOfTestGeneration,
+                        isCodeBlockSelected = session.isCodeBlockSelected,
+                        artifactsUploadDuration = session.artifactUploadDuration,
+                        buildPayloadBytes = session.srcPayloadSize,
+                        buildZipFileBytes = session.srcZipFileSize,
+                        requestId = session.startTestGenerationRequestId,
+                        status = Status.REJECTED
+                    )
+                } else {
+                    AmazonqTelemetry.unitTestGeneration(
+                        count = session.listOfTestGenerationJobId.size.toLong() - 1,
+                        cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                        hasUserPromptSupplied = session.hasUserPromptSupplied,
+                        isSupportedLanguage = true,
+                        credentialStartUrl = getStartUrl(project = context.project),
+                        jobGroup = session.testGenerationJobGroupName,
+                        jobId = session.testGenerationJob,
+                        acceptedCount = 0,
+                        generatedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
+                        acceptedLinesCount = 0,
+                        generatedLinesCount = session.linesOfCodeGenerated?.toLong(),
+                        acceptedCharactersCount = 0,
+                        generatedCharactersCount = session.charsOfCodeGenerated?.toLong(),
+                        result = when (session.buildStatus) {
+                            BuildStatus.SUCCESS -> MetricResult.Succeeded
+                            BuildStatus.FAILURE -> MetricResult.Failed
+                            else -> MetricResult.Cancelled
+                        },
+                        perfClientLatency = session.latencyOfTestGeneration,
+                        isCodeBlockSelected = session.isCodeBlockSelected,
+                        artifactsUploadDuration = session.artifactUploadDuration,
+                        buildZipFileBytes = session.srcZipFileSize,
+                        requestId = session.startTestGenerationRequestId,
+                        update = session.updateBuildCommands,
+                    )
+                }
 
-                UiTelemetry.click(null as Project?, "unitTestGeneration_rejectDiff")
-                AmazonqTelemetry.utgGenerateTests(
+                sessionCleanUp(message.tabId)
+            }
+            "utg_skip_and_finish" -> {
+                codeTestChatHelper.addAnswer(
+                    CodeTestChatMessageContent(
+                        message = message("testgen.message.success"),
+                        type = ChatMessageType.Answer,
+                        canBeVoted = false
+                    )
+                )
+                AmazonqTelemetry.unitTestGeneration(
+                    count = session.listOfTestGenerationJobId.size.toLong() - 1,
                     cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
                     hasUserPromptSupplied = session.hasUserPromptSupplied,
-                    isFileInWorkspace = true,
                     isSupportedLanguage = true,
                     credentialStartUrl = getStartUrl(project = context.project),
                     jobGroup = session.testGenerationJobGroupName,
                     jobId = session.testGenerationJob,
-                    acceptedCount = 0,
+                    acceptedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
                     generatedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
-                    acceptedLinesCount = 0,
+                    acceptedLinesCount = session.linesOfCodeGenerated?.toLong(),
                     generatedLinesCount = session.linesOfCodeGenerated?.toLong(),
-                    acceptedCharactersCount = 0,
+                    acceptedCharactersCount = session.charsOfCodeGenerated?.toLong(),
                     generatedCharactersCount = session.charsOfCodeGenerated?.toLong(),
-                    result = MetricResult.Succeeded,
+                    result = when (session.buildStatus) {
+                        BuildStatus.SUCCESS -> MetricResult.Succeeded
+                        BuildStatus.FAILURE -> MetricResult.Failed
+                        else -> MetricResult.Cancelled
+                    },
                     perfClientLatency = session.latencyOfTestGeneration,
                     isCodeBlockSelected = session.isCodeBlockSelected,
                     artifactsUploadDuration = session.artifactUploadDuration,
-                    buildPayloadBytes = session.srcPayloadSize,
                     buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
-                )
-                sessionCleanUp(message.tabId)
-            }
-            "utg_skip_and_finish" -> {
-                codeTestChatHelper.addAnswer(
-                    CodeTestChatMessageContent(
-                        message = message("testgen.message.success"),
-                        type = ChatMessageType.Answer,
-                        canBeVoted = false
-                    )
+                    requestId = session.startTestGenerationRequestId,
+                    update = session.updateBuildCommands,
                 )
                 sessionCleanUp(message.tabId)
             }
@@ -896,20 +988,22 @@ class CodeTestChatController(
                 // handle both "Proceed" and "Build and execute" button clicks since their actions are similar
                 // TODO: show install dependencies card if needed
                 session.conversationState = ConversationState.IN_PROGRESS
+                codeTestChatHelper.updateUI(
+                    promptInputDisabledState = true,
+                    promptInputProgress = createProgressField("testgen.progressbar.build_and_execute")
+                )
 
                 // display build in progress card
                 val taskContext = session.buildAndExecuteTaskContext
 
                 taskContext.progressStatus = BuildAndExecuteProgressStatus.RUN_BUILD
-                val messageId = updateBuildAndExecuteProgressCard(taskContext.progressStatus, null, session.iteration)
-                // TODO: build and execute case
+                val messageId = updateBuildAndExecuteProgressCard(taskContext.progressStatus, null)
                 val buildLogsFile = VirtualFileManager.getInstance().findFileByNioPath(
                     withContext(currentCoroutineContext()) {
                         Files.createTempFile(null, null)
                     }
                 )
                 if (buildLogsFile == null) {
-                    // TODO: handle no log file case
                     return
                 }
                 LOG.debug {
@@ -917,44 +1011,26 @@ class CodeTestChatController(
                         "tmpFile for build logs:\n ${buildLogsFile.path}"
                 }
 
-                runBuildOrTestCommand(taskContext.buildCommand, buildLogsFile, context.project, isBuildCommand = true, taskContext)
-                while (taskContext.buildExitCode < 0) {
-                    // wait until build command finished
-                    delay(1000)
-                }
-
-                // TODO: only go to future iterations when buildExitCode or testExitCode > 0, right now iterate regardless
-                if (taskContext.buildExitCode > 0) {
-                    // TODO: handle build failure case
-                    // ...
-//                    return
-                }
-                taskContext.progressStatus = BuildAndExecuteProgressStatus.RUN_EXECUTION_TESTS
-                updateBuildAndExecuteProgressCard(taskContext.progressStatus, messageId, session.iteration)
-
-                val testLogsFile = VirtualFileManager.getInstance().findFileByNioPath(
-                    withContext(currentCoroutineContext()) {
-                        Files.createTempFile(null, null)
-                    }
+                runBuildOrTestCommand(
+                    taskContext.buildCommand,
+                    buildLogsFile,
+                    context.project,
+                    isBuildCommand = true,
+                    taskContext,
+                    session.testFileRelativePathToProjectRoot,
+                    codeTestChatHelper
                 )
-                if (testLogsFile == null) {
-                    // TODO: handle no log file case
+                if (session.buildStatus === BuildStatus.CANCELLED) {
                     return
                 }
-                LOG.debug {
-                    "Q TestGen session: ${codeTestChatHelper.getActiveCodeTestTabId()}: " +
-                        "tmpFile for test logs:\n ${buildLogsFile.path}"
-                }
-                delay(1000)
-                runBuildOrTestCommand(taskContext.executionCommand, testLogsFile, context.project, isBuildCommand = false, taskContext)
-                while (taskContext.testExitCode < 0) {
-                    // wait until test command finished
+                while (taskContext.buildExitCode < 0) {
+                    // wait until build command finished
                     delay(1000)
                 }
 
-                if (taskContext.testExitCode == 0) {
-                    taskContext.progressStatus = BuildAndExecuteProgressStatus.TESTS_EXECUTED
-                    updateBuildAndExecuteProgressCard(taskContext.progressStatus, messageId, session.iteration)
+                if (taskContext.buildExitCode == 0) {
+                    taskContext.progressStatus = BuildAndExecuteProgressStatus.PROCESS_TEST_RESULTS
+                    updateBuildAndExecuteProgressCard(taskContext.progressStatus, messageId)
                     codeTestChatHelper.addAnswer(
                         CodeTestChatMessageContent(
                             message = message("testgen.message.success"),
@@ -962,30 +1038,66 @@ class CodeTestChatController(
                             canBeVoted = false
                         )
                     )
+                    codeTestChatHelper.updateUI(
+                        promptInputProgress = testGenCompletedField,
+                    )
+                    delay(1000)
+                    codeTestChatHelper.sendUpdatePromptProgress(session.tabId, null)
+                    AmazonqTelemetry.unitTestGeneration(
+                        count = session.listOfTestGenerationJobId.size.toLong() - 1,
+                        cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                        hasUserPromptSupplied = session.hasUserPromptSupplied,
+                        isSupportedLanguage = true,
+                        credentialStartUrl = getStartUrl(project = context.project),
+                        jobGroup = session.testGenerationJobGroupName,
+                        jobId = session.testGenerationJob,
+                        acceptedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
+                        generatedCount = session.numberOfUnitTestCasesGenerated?.toLong(),
+                        acceptedLinesCount = session.linesOfCodeGenerated?.toLong(),
+                        generatedLinesCount = session.linesOfCodeGenerated?.toLong(),
+                        acceptedCharactersCount = session.charsOfCodeGenerated?.toLong(),
+                        generatedCharactersCount = session.charsOfCodeGenerated?.toLong(),
+                        result = MetricResult.Succeeded,
+                        perfClientLatency = session.latencyOfTestGeneration,
+                        isCodeBlockSelected = session.isCodeBlockSelected,
+                        artifactsUploadDuration = session.artifactUploadDuration,
+                        buildZipFileBytes = session.srcZipFileSize,
+                        requestId = session.startTestGenerationRequestId,
+                        update = session.updateBuildCommands,
+                        status = Status.ACCEPTED
+                    )
                     sessionCleanUp(message.tabId)
                     return
                 }
 
-                // has test failure, we will zip the latest project and invoke backend again
-                taskContext.progressStatus = BuildAndExecuteProgressStatus.FIXING_TEST_CASES
-                val buildAndExecuteMessageId = updateBuildAndExecuteProgressCard(taskContext.progressStatus, messageId, session.iteration)
-
-                val previousUTGIterationContext = PreviousUTGIterationContext(
-                    buildLogFile = buildLogsFile,
-                    testLogFile = testLogsFile,
-                    selectedFile = session.selectedFile,
-                    buildAndExecuteMessageId = buildAndExecuteMessageId
-                )
+                // TODO: only go to future iterations when buildExitCode or testExitCode > 0, right now iterate regardless
+                if (taskContext.buildExitCode > 0) {
+                    // handle build failure case
+
+                    taskContext.progressStatus = BuildAndExecuteProgressStatus.BUILD_FAILED
+                    updateBuildAndExecuteProgressCard(taskContext.progressStatus, messageId)
+                    taskContext.progressStatus = BuildAndExecuteProgressStatus.RUN_EXECUTION_TESTS
+                    val buildAndExecuteMessageId = updateBuildAndExecuteProgressCard(taskContext.progressStatus, messageId)
+                    val previousUTGIterationContext = PreviousUTGIterationContext(
+                        buildLogFile = buildLogsFile,
+                        testLogFile = null,
+                        selectedFile = session.selectedFile,
+                        buildAndExecuteMessageId = buildAndExecuteMessageId
+                    )
 
-                val job = CodeWhispererUTGChatManager.getInstance(context.project).generateTests("", codeTestChatHelper, previousUTGIterationContext, null)
-                job?.join()
+                    session.isGeneratingTests = false
+                    session.conversationState = ConversationState.IDLE
 
-                taskContext.progressStatus = BuildAndExecuteProgressStatus.PROCESS_TEST_RESULTS
-                // session.iteration already updated in generateTests
-                updateBuildAndExecuteProgressCard(taskContext.progressStatus, messageId, session.iteration - 1)
+                    val job = CodeWhispererUTGChatManager.getInstance(
+                        context.project
+                    ).generateTests(session.userPrompt, codeTestChatHelper, previousUTGIterationContext, null)
+                    job?.join()
+                    return
+                }
             }
             "utg_modify_command" -> {
                 // TODO allow user input to modify the command
+                session.updateBuildCommands = true
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
                         message = """
@@ -996,15 +1108,61 @@ class CodeTestChatController(
                         canBeVoted = false
                     )
                 )
+                codeTestChatHelper.updateUI(
+                    promptInputDisabledState = false,
+                    promptInputPlaceholder = message("testgen.placeholder.modifyCommand"),
+                )
+
                 session.conversationState = ConversationState.WAITING_FOR_BUILD_COMMAND_INPUT
             }
             "utg_install_and_continue" -> {
                 // TODO: install dependencies and build
             }
             "stop_test_generation" -> {
-                UiTelemetry.click(null as Project?, "unitTestGeneration_cancelTestGenerationProgress")
+                UiTelemetry.click(context.project, "unitTestGeneration_cancelTestGenerationProgress")
+                session.isGeneratingTests = false
+                return
+            }
+            "stop_test_gen_build_and_execution" -> {
+                UiTelemetry.click(context.project, "unitTestGeneration_cancelBuildProgress")
+                session.buildStatus = BuildStatus.CANCELLED
+                session.isGeneratingTests = false
+                AmazonqTelemetry.unitTestGeneration(
+                    cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
+                    hasUserPromptSupplied = session.hasUserPromptSupplied,
+                    isSupportedLanguage = true,
+                    credentialStartUrl = getStartUrl(project = context.project),
+                    jobGroup = session.testGenerationJobGroupName,
+                    jobId = session.testGenerationJob,
+                    result = MetricResult.Cancelled,
+                    reason = null,
+                    reasonDesc = null,
+                    perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
+                    isCodeBlockSelected = session.isCodeBlockSelected,
+                    artifactsUploadDuration = session.artifactUploadDuration,
+                    buildZipFileBytes = session.srcZipFileSize,
+                    requestId = session.startTestGenerationRequestId,
+                    status = Status.CANCELLED,
+                )
+                codeTestChatHelper.updateUI(
+                    promptInputDisabledState = false,
+                    promptInputProgress = cancellingProgressField,
+                    promptInputPlaceholder = message("testgen.placeholder.enter_slash_quick_actions"),
+                )
+                delay(1000)
+                codeTestChatHelper.addAnswer(
+                    CodeTestChatMessageContent(
+                        message = message("testgen.message.cancelled"),
+                        type = ChatMessageType.Answer,
+                        canBeVoted = false
+                    )
+                )
+                codeTestChatHelper.sendUpdatePromptProgress(session.tabId, null)
+                return
+            }
+            "stop_fixing_test_cases" -> {
+                UiTelemetry.click(context.project, "unitTestGeneration_cancelFixingTest")
                 session.isGeneratingTests = false
-                sessionCleanUp(message.tabId)
                 return
             }
             else -> {
@@ -1024,9 +1182,8 @@ class CodeTestChatController(
     private suspend fun updateBuildAndExecuteProgressCard(
         currentStatus: BuildAndExecuteProgressStatus,
         messageId: String?,
-        iterationNum: Int,
     ): String? {
-        val updatedText = constructBuildAndExecutionSummaryText(currentStatus, iterationNum)
+        val updatedText = constructBuildAndExecutionSummaryText(currentStatus, codeTestChatHelper)
 
         if (currentStatus == BuildAndExecuteProgressStatus.RUN_BUILD) {
             val buildAndExecuteMessageId = codeTestChatHelper.addAnswer(
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/messages/CodeTestMessage.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/messages/CodeTestMessage.kt
index dcf5f9e67c..23976ada8a 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/messages/CodeTestMessage.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/messages/CodeTestMessage.kt
@@ -16,6 +16,8 @@ const val CODE_TEST_TAB_NAME = "codetest"
 
 enum class CodeTestButtonId(val id: String) {
     StopTestGeneration("stop_test_generation"),
+    StopTestGenBuildAndExecution("stop_test_gen_build_and_execution"),
+    StopFixingTestCases("stop_fixing_test_cases"),
 }
 
 data class Button(
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/model/BuildAndExecuteStatusIcon.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/model/BuildAndExecuteStatusIcon.kt
index 0847cec649..de559fe086 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/model/BuildAndExecuteStatusIcon.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/model/BuildAndExecuteStatusIcon.kt
@@ -3,37 +3,8 @@
 
 package software.aws.toolkits.jetbrains.services.amazonqCodeTest.model
 
-import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.BuildAndExecuteProgressStatus
-
 enum class BuildAndExecuteStatusIcon(val icon: String) {
-    WAIT("<span>&#9744;</span>"),
-    CURRENT("<span>&#9744;</span>"),
+    WAIT("<span>&#9203;</span>"),
     DONE("<span style=\"color: green;\">&#10004;</span>"),
+    FAILED("<span style=\"color: red;\">&#10060;</span>"),
 }
-
-fun getBuildIcon(progressStatus: BuildAndExecuteProgressStatus) =
-    if (progressStatus < BuildAndExecuteProgressStatus.RUN_BUILD) {
-        BuildAndExecuteStatusIcon.WAIT.icon
-    } else if (progressStatus == BuildAndExecuteProgressStatus.RUN_BUILD) {
-        BuildAndExecuteStatusIcon.CURRENT.icon
-    } else {
-        BuildAndExecuteStatusIcon.DONE.icon
-    }
-
-fun getExecutionIcon(progressStatus: BuildAndExecuteProgressStatus) =
-    if (progressStatus < BuildAndExecuteProgressStatus.RUN_EXECUTION_TESTS) {
-        BuildAndExecuteStatusIcon.WAIT.icon
-    } else if (progressStatus == BuildAndExecuteProgressStatus.RUN_EXECUTION_TESTS) {
-        BuildAndExecuteStatusIcon.CURRENT.icon
-    } else {
-        BuildAndExecuteStatusIcon.DONE.icon
-    }
-
-fun getFixingTestCasesIcon(progressStatus: BuildAndExecuteProgressStatus) =
-    if (progressStatus < BuildAndExecuteProgressStatus.FIXING_TEST_CASES) {
-        BuildAndExecuteStatusIcon.WAIT.icon
-    } else if (progressStatus == BuildAndExecuteProgressStatus.FIXING_TEST_CASES) {
-        BuildAndExecuteStatusIcon.CURRENT.icon
-    } else {
-        BuildAndExecuteStatusIcon.DONE.icon
-    }
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/model/PreviousUTGIterationContext.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/model/PreviousUTGIterationContext.kt
index 4576a0ea0c..9ee4c0fe33 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/model/PreviousUTGIterationContext.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/model/PreviousUTGIterationContext.kt
@@ -7,7 +7,7 @@ import com.intellij.openapi.vfs.VirtualFile
 
 data class PreviousUTGIterationContext(
     val buildLogFile: VirtualFile,
-    val testLogFile: VirtualFile,
+    val testLogFile: VirtualFile?,
     val selectedFile: VirtualFile?,
     val buildAndExecuteMessageId: String?,
 )
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/session/Session.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/session/Session.kt
index f7c067b5b8..44f4b3453c 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/session/Session.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/session/Session.kt
@@ -33,9 +33,10 @@ data class Session(val tabId: String) {
     var srcPayloadSize: Long = 0
     var srcZipFileSize: Long = 0
     var artifactUploadDuration: Long = 0
+    var updateBuildCommands: Boolean = false
 
     // First iteration will have a value of 1
-    var iteration: Int = 0
+    var userPrompt: String = ""
     var projectRoot: String = "/"
     var shortAnswer: ShortAnswer = ShortAnswer()
     var selectedFile: VirtualFile? = null
@@ -48,6 +49,8 @@ data class Session(val tabId: String) {
 
     // Build loop execution
     val buildAndExecuteTaskContext = BuildAndExecuteTaskContext()
+    var listOfTestGenerationJobId: List<String> = listOf()
+    var buildStatus: BuildStatus = BuildStatus.SUCCESS
 }
 
 data class BuildAndExecuteTaskContext(
@@ -62,10 +65,16 @@ enum class BuildAndExecuteProgressStatus {
     START_STEP,
     INSTALL_DEPENDENCIES,
     RUN_BUILD,
+    BUILD_FAILED,
     RUN_EXECUTION_TESTS,
-    TESTS_EXECUTED,
     FIXING_TEST_CASES,
     PROCESS_TEST_RESULTS,
 }
 
+enum class BuildStatus {
+    SUCCESS,
+    FAILURE,
+    CANCELLED,
+}
+
 const val UTG_CHAT_MAX_ITERATION = 4
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/utils/UTGChatUtil.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/utils/UTGChatUtil.kt
index 9b1615c461..f04104a6f6 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/utils/UTGChatUtil.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/utils/UTGChatUtil.kt
@@ -4,75 +4,57 @@
 package software.aws.toolkits.jetbrains.services.amazonqCodeTest.utils
 
 import com.intellij.build.BuildContentManager
+import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.execution.impl.ConsoleViewImpl
 import com.intellij.execution.process.OSProcessHandler
 import com.intellij.execution.process.ProcessAdapter
 import com.intellij.execution.process.ProcessEvent
-import com.intellij.execution.process.ProcessHandler
 import com.intellij.execution.ui.ConsoleView
 import com.intellij.execution.ui.ConsoleViewContentType
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
+import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.ui.content.impl.ContentImpl
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.withContext
-import software.aws.toolkits.jetbrains.core.coroutines.EDT
-import software.aws.toolkits.jetbrains.services.amazonqCodeTest.model.getBuildIcon
-import software.aws.toolkits.jetbrains.services.amazonqCodeTest.model.getExecutionIcon
-import software.aws.toolkits.jetbrains.services.amazonqCodeTest.model.getFixingTestCasesIcon
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.controller.CodeTestChatHelper
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.model.BuildAndExecuteStatusIcon
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.BuildAndExecuteProgressStatus
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.BuildAndExecuteTaskContext
+import software.aws.toolkits.jetbrains.services.amazonqCodeTest.session.BuildStatus
 import java.io.File
-import java.nio.charset.StandardCharsets
-import java.nio.file.Files
+import java.io.FileWriter
 
-fun constructBuildAndExecutionSummaryText(currentStatus: BuildAndExecuteProgressStatus, iterationNum: Int): String {
+fun constructBuildAndExecutionSummaryText(currentStatus: BuildAndExecuteProgressStatus, codeTestChatHelper: CodeTestChatHelper): String {
     val progressMessages = mutableListOf<String>()
-
-    if (currentStatus >= BuildAndExecuteProgressStatus.RUN_BUILD) {
-        val verb = if (currentStatus == BuildAndExecuteProgressStatus.RUN_BUILD) "in progress" else "complete"
-        progressMessages.add("${getBuildIcon(currentStatus)}: Build $verb")
+    if (currentStatus == BuildAndExecuteProgressStatus.RUN_BUILD) {
+        progressMessages.add("${BuildAndExecuteStatusIcon.WAIT.icon} ${"Project compiling\n"}")
     }
 
-    if (currentStatus >= BuildAndExecuteProgressStatus.RUN_EXECUTION_TESTS) {
-        val verb = if (currentStatus == BuildAndExecuteProgressStatus.RUN_EXECUTION_TESTS) "Executing" else "Executed"
-        progressMessages.add("${getExecutionIcon(currentStatus)}: $verb passed tests")
+    if (currentStatus == BuildAndExecuteProgressStatus.RUN_EXECUTION_TESTS && codeTestChatHelper.getActiveSession().buildStatus == BuildStatus.FAILURE) {
+        progressMessages.add("${BuildAndExecuteStatusIcon.WAIT.icon} ${"Fixing test failures\n"}")
     }
 
-    if (currentStatus >= BuildAndExecuteProgressStatus.FIXING_TEST_CASES) {
-        val verb = if (currentStatus == BuildAndExecuteProgressStatus.FIXING_TEST_CASES) "Fixing" else "Fixed"
-        progressMessages.add("${getFixingTestCasesIcon(currentStatus)}: $verb errors in tests")
+    if (currentStatus > BuildAndExecuteProgressStatus.RUN_EXECUTION_TESTS && codeTestChatHelper.getActiveSession().buildStatus == BuildStatus.FAILURE) {
+        progressMessages.add("${BuildAndExecuteStatusIcon.DONE.icon} ${"Fixed test failures\n"}")
     }
 
-    if (currentStatus >= BuildAndExecuteProgressStatus.PROCESS_TEST_RESULTS) {
+    if (currentStatus >= BuildAndExecuteProgressStatus.RUN_EXECUTION_TESTS && codeTestChatHelper.getActiveSession().buildStatus == BuildStatus.SUCCESS) {
+        progressMessages.add("${BuildAndExecuteStatusIcon.DONE.icon} ${"Project compiled"}")
+        progressMessages.add("${BuildAndExecuteStatusIcon.DONE.icon} ${"All tests passed\n"}")
+    }
+// TODO: Commenting out this code to do a better UX in the V2 version after science support
+    if (currentStatus >= BuildAndExecuteProgressStatus.FIXING_TEST_CASES && codeTestChatHelper.getActiveSession().buildStatus == BuildStatus.FAILURE) {
         progressMessages.add("\n")
-        progressMessages.add("**Test case summary**")
+        progressMessages.add("**Results**")
         progressMessages.add("\n")
-        progressMessages.add("Unit test coverage X%")
-        progressMessages.add("Build fails Y")
-        progressMessages.add("Assertion fails Z")
+        progressMessages.add("Amazon Q executed the tests and identified at least one failure. Below are the suggested fixes.")
     }
 
-    val prefix =
-        if (iterationNum < 2) {
-            "Sure"
-        } else {
-            val timeString = when (iterationNum) {
-                2 -> "second"
-                3 -> "third"
-                4 -> "fourth"
-                // shouldn't reach
-                else -> "fifth"
-            }
-            "Working on the $timeString iteration now"
-        }
-
     // Join all progress messages into a single string
     return """
-            $prefix. This may take a few minutes and I'll update the progress here.
+            Sure, This may take a few minutes and I'll update the progress here.
         
             **Progress summary**
             
@@ -85,56 +67,102 @@ fun runBuildOrTestCommand(
     project: Project,
     isBuildCommand: Boolean,
     buildAndExecuteTaskContext: BuildAndExecuteTaskContext,
+    testFileRelativePathToProjectRoot: String,
+    codeTestChatHelper: CodeTestChatHelper,
 ) {
+    val brazilPath = "${System.getProperty("user.home")}/.toolbox/bin:/usr/local/bin:/usr/bin:/bin:/sbin"
     if (localCommand.isEmpty()) {
         buildAndExecuteTaskContext.testExitCode = 0
         return
     }
-    val repositoryPath = project.basePath ?: return
-    val commandParts = localCommand.split(" ")
-    val command = commandParts.first()
-    val args = commandParts.drop(1)
+    val projectRoot = File(project.basePath ?: return)
+    val testFileAbsolutePath = File(projectRoot, testFileRelativePathToProjectRoot)
     val file = File(tmpFile.path)
 
-    // Create Console View for Build Output
+    // Find the nearest Gradle root directory
+    var packageRoot: File? = testFileAbsolutePath.parentFile
+    var foundGradleRoot = false
+    while (packageRoot != null && !FileUtil.filesEqual(packageRoot, projectRoot)) {
+        if (File(packageRoot, "settings.gradle.kts").exists() || File(packageRoot, "build.gradle.kts").exists() ||
+            File(packageRoot, "settings.gradle").exists() || File(packageRoot, "build.gradle").exists()
+        ) {
+            foundGradleRoot = true
+            break // Store the last valid Gradle root found
+        }
+        packageRoot = packageRoot.parentFile
+    }
+    val workingDir = if (foundGradleRoot) {
+        packageRoot ?: testFileAbsolutePath.parentFile
+    } else {
+        testFileAbsolutePath.parentFile
+    }
+
     val console: ConsoleView = ConsoleViewImpl(project, true)
 
     // Attach Console View to Build Tool Window
     ApplicationManager.getApplication().invokeLater {
         val tabName = if (isBuildCommand) "Q TestGen Build Output" else "Q Test Gen Test Execution Output"
+
+        // Get the BuildContentManager instance
+        val buildContentManager = BuildContentManager.getInstance(project)
+
+        val toolWindow = buildContentManager.getOrCreateToolWindow()
+        val contentManager = toolWindow.contentManager
+
+        // Check if tab already exists
+        val existingContent = contentManager.contents.find { it.displayName == tabName }
+
+        if (existingContent != null) {
+            // If tab exists, remove it
+            buildContentManager.removeContent(existingContent)
+        }
+        // Create and add new content
         val content = ContentImpl(console.component, tabName, true)
-        BuildContentManager.getInstance(project).addContent(content)
-        // TODO: remove these tabs when they are not needed
-        BuildContentManager.getInstance(project).setSelectedContent(content, false, false, true, null)
+        buildContentManager.addContent(content)
+        buildContentManager.setSelectedContent(content, false, false, true, null)
     }
 
-    val processBuilder = ProcessBuilder()
-        .command(listOf(command) + args)
-        .directory(File(repositoryPath))
-        .redirectErrorStream(true)
+    val commandLine = when {
+        System.getProperty("os.name").lowercase().contains("win") -> {
+            GeneralCommandLine("cmd.exe", "/c", "set PATH=%PATH%;$brazilPath && $localCommand")
+        }
+        else -> {
+            GeneralCommandLine("sh", "-c", "export PATH=\"$brazilPath\" && $localCommand")
+        }
+    }.withWorkDirectory(workingDir)
 
     try {
-        val process = processBuilder.start()
-        val processHandler: ProcessHandler = OSProcessHandler(process, localCommand, null)
+        val processHandler = OSProcessHandler(commandLine)
 
         // Attach Process Listener for Output Handling
         processHandler.addProcessListener(object : ProcessAdapter() {
             override fun onTextAvailable(event: ProcessEvent, outputType: Key<*>) {
                 val cleanedText = cleanText(event.text)
+                FileWriter(file, true).use { writer ->
+                    writer.append(cleanedText)
+                    writer.append("\n")
+                }
                 ApplicationManager.getApplication().invokeLater {
-                    ApplicationManager.getApplication().runWriteAction {
-                        file.appendText(cleanedText)
+                    VirtualFileManager.getInstance().refreshAndFindFileByNioPath(file.toPath())?.refresh(false, false)
+                }
+                // Check if the build has been cancelled
+                if (codeTestChatHelper.getActiveSession().buildStatus == BuildStatus.CANCELLED) {
+                    processHandler.destroyProcess()
+                    console.print("\nBuild cancelled by user\n", ConsoleViewContentType.ERROR_OUTPUT)
+                    if (isBuildCommand) {
+                        buildAndExecuteTaskContext.buildExitCode = 1
+                    } else {
+                        buildAndExecuteTaskContext.testExitCode = 1
                     }
                 }
             }
-
             override fun processTerminated(event: ProcessEvent) {
                 val exitCode = event.exitCode
                 if (exitCode == 0) {
-                    // green color
+                    codeTestChatHelper.getActiveSession().buildStatus = BuildStatus.SUCCESS
                     console.print("\nBUILD SUCCESSFUL\n", ConsoleViewContentType.USER_INPUT)
-                } else {
-                    // red color
+                } else if (codeTestChatHelper.getActiveSession().buildStatus != BuildStatus.CANCELLED) {
+                    codeTestChatHelper.getActiveSession().buildStatus = BuildStatus.FAILURE
                     console.print("\nBUILD FAILED with exit code $exitCode\n", ConsoleViewContentType.ERROR_OUTPUT)
                 }
                 if (isBuildCommand) {
@@ -173,28 +201,3 @@ private fun cleanText(input: String): String {
     }
     return cleaned.toString()
 }
-
-suspend fun combineBuildAndExecuteLogFiles(
-    buildLogFile: VirtualFile?,
-    testLogFile: VirtualFile?,
-): VirtualFile? {
-    if (buildLogFile == null || testLogFile == null) return null
-    val buildLogFileContent = String(buildLogFile.contentsToByteArray(), StandardCharsets.UTF_8)
-    val testLogFileContent = String(testLogFile.contentsToByteArray(), StandardCharsets.UTF_8)
-
-    val combinedContent = "Build Output:\n$buildLogFileContent\nTest Execution Output:\n$testLogFileContent"
-
-    // Create a new virtual file and write combined content
-    val newFile = VirtualFileManager.getInstance().findFileByNioPath(
-        withContext(currentCoroutineContext()) {
-            Files.createTempFile(null, null)
-        }
-    )
-    withContext(EDT) {
-        ApplicationManager.getApplication().runWriteAction {
-            newFile?.setBinaryContent(combinedContent.toByteArray(StandardCharsets.UTF_8))
-        }
-    }
-
-    return newFile
-}
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt
index a565da482c..6f49ed5532 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt
@@ -29,7 +29,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.codetest.noFileOpe
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererUnknownLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_PAYLOAD_LIMIT_IN_BYTES
@@ -156,7 +155,7 @@ class CodeTestSessionConfig(
         it.putNextEntry(utgEntry)
 
         // 3. Add the three empty subdirectories
-        val buildAndExecuteLogDir = "buildAndExecuteLogDir"
+        val buildAndExecuteLogDir = "buildAndExecuteLogDir/"
         val subDirs = listOf(buildAndExecuteLogDir, "repoMapData", "testCoverageDir")
         subDirs.forEach { subDir ->
             val subDirPathString = Path.of(utgDir, subDir).toString() + "/" // Added trailing slash similar to utgRequiredArtifactsDir
@@ -165,7 +164,9 @@ class CodeTestSessionConfig(
             it.putNextEntry(zipEntry)
         }
         if (buildAndExecuteLogFile != null) {
-            it.putNextEntry(Path.of(utgDir, buildAndExecuteLogDir, "buildAndExecuteLog").name, buildAndExecuteLogFile.inputStream)
+            val buildLogFilePath = Path.of(utgDir, buildAndExecuteLogDir, "buildAndExecuteLog")
+                .toString().replace("\\", "/") // Ensures consistent path format
+            it.putNextEntry(buildLogFilePath, buildAndExecuteLogFile.inputStream)
         }
         if (payloadMetadata.payloadLimitCrossed == true) {
             // write payloadMetadata.payloadManifest into a json file in repoMapData directory. manifest is Set<Pair<String, Long>> write into file first or ina byte stream
@@ -218,7 +219,7 @@ class CodeTestSessionConfig(
             for (module in project.modules) {
                 val changeListManager = ChangeListManager.getInstance(module.project)
                 module.guessModuleDir()?.let { moduleDir ->
-                    val gitIgnoreFilteringUtil = GitIgnoreFilteringUtil(moduleDir, CodeWhispererConstants.FeatureName.TEST_GENERATION)
+                    val gitIgnoreFilteringUtil = GitIgnoreFilteringUtil(moduleDir)
                     stack.push(moduleDir)
                     while (stack.isNotEmpty()) {
                         val current = stack.pop()
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt
index e2e55b8643..a373e95c7e 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt
@@ -77,6 +77,10 @@ interface CodeWhispererClientAdaptor : Disposable {
         firstRequest: GenerateCompletionsRequest,
     ): Sequence<GenerateCompletionsResponse>
 
+    fun generateCompletions(
+        firstRequest: GenerateCompletionsRequest,
+    ): GenerateCompletionsResponse
+
     fun createUploadUrl(
         request: CreateUploadUrlRequest,
     ): CreateUploadUrlResponse
@@ -102,7 +106,7 @@ interface CodeWhispererClientAdaptor : Disposable {
 
     fun listAvailableCustomizations(): List<CodeWhispererCustomization>
 
-    fun startTestGeneration(uploadId: String, targetCode: List<TargetCode>, userInput: String): StartTestGenerationResponse
+    fun startTestGeneration(uploadId: String, targetCode: List<TargetCode>, userInput: String, testGenerationJobGroupName: String): StartTestGenerationResponse
 
     fun getTestGeneration(jobId: String, jobGroupName: String): GetTestGenerationResponse
 
@@ -323,6 +327,8 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
             yield(response)
         } while (!nextToken.isNullOrEmpty())
     }
+    override fun generateCompletions(firstRequest: GenerateCompletionsRequest): GenerateCompletionsResponse =
+        bearerClient().generateCompletions(firstRequest)
 
     override fun createUploadUrl(request: CreateUploadUrlRequest): CreateUploadUrlResponse =
         bearerClient().createUploadUrl(request)
@@ -372,11 +378,17 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
                 }
             }
 
-    override fun startTestGeneration(uploadId: String, targetCode: List<TargetCode>, userInput: String): StartTestGenerationResponse =
+    override fun startTestGeneration(
+        uploadId: String,
+        targetCode: List<TargetCode>,
+        userInput: String,
+        testGenerationJobGroupName: String,
+    ): StartTestGenerationResponse =
         bearerClient().startTestGeneration { builder ->
             builder.uploadId(uploadId)
             builder.targetCodeList(targetCode)
             builder.userInput(userInput)
+            builder.testGenerationJobGroupName(testGenerationJobGroupName)
             // TODO: client token
         }
 
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
index 87c11fd21c..7b73ffa0dc 100644
--- a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
+++ b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -2073,10 +2073,14 @@ testgen.message.regenerate_input=Sure thing. Please provide new instructions for
 testgen.message.success=Unit test generation completed.
 testgen.no_file_found=Sorry, there isn't a source file open right now that I can generate a test for. Make sure you open a source file so I can generate tests.
 testgen.placeholder.enter_slash_quick_actions=Enter "/" for quick actions
+testgen.placeholder.modifyCommand=Type command lines or provide instructions...
 testgen.placeholder.newtab=Ask any coding question or type \u0022/\u0022 for actions
+testgen.placeholder.select_an_action_to_proceed=Please select an action to proceed.
 testgen.placeholder.select_an_option = Please select an action to proceed (Accept or Reject)
 testgen.placeholder.view_diff=Select View Diff to see the generated unit tests
 testgen.placeholder.waiting_on_your_inputs=Waiting on your inputs...
+testgen.progressbar.build_and_execute=Compiling project...
+testgen.progressbar.fixing_test_cases=Fixing test failures...
 testgen.progressbar.generate_unit_tests=Generating unit tests...
 toolkit.login.aws_builder_id.already_connected.cancel=Use existing AWS Builder ID
 toolkit.login.aws_builder_id.already_connected.message=You already signed in with an AWS Builder ID.\nSign out to add another?