diff --git a/PERFTEST.PS1 b/PERFTEST.PS1
index f3ec77f..cdc9a0f 100644
--- a/PERFTEST.PS1
+++ b/PERFTEST.PS1
@@ -5,7 +5,6 @@ Param(
     [parameter(Mandatory=$true)]  [string] $SrcIp, 
     [parameter(Mandatory=$true)]  [string] $DestIp,
     [parameter(Mandatory=$true)]  [ValidateScript({Test-Path $_ -PathType Container})] [String] $OutDir = "",
-    [ValidateSet("Default", "Azure", "Detail", "Max", "Container")]
     [parameter(Mandatory=$false)] [string] $Config = "Default",
     [parameter(Mandatory=$false)]  [Array] $ToolList = @("ntttcp", "latte", "l4ping", "cps", "ctstraffic", "ncps", "secnetperf"),
     [parameter(Mandatory=$false)] [switch] $SamePort = $false
diff --git a/SetupTearDown.ps1 b/SetupTearDown.ps1
index 2e062b8..d5744b7 100644
--- a/SetupTearDown.ps1
+++ b/SetupTearDown.ps1
@@ -118,16 +118,11 @@ param(
         Write-Host "`nSSHD default config files already exist"
     }
 
-    if (-NOT (Test-Path "$env:ProgramData\ssh\administrators_authorized_keys"))
-    {
+    if ($null -eq (Select-String -Path "$env:ProgramData\ssh\administrators_authorized_keys" -Pattern $authorizedKey)) {
         Write-Host "`nAdd the AuthorizedKey as a trusted admin key"
-        Add-Content -Force -Path "$env:ProgramData\ssh\administrators_authorized_keys" -Value "$authorizedKey"
+        Add-Content -Force -Path "$env:ProgramData\ssh\administrators_authorized_keys" -Value "`n$authorizedKey"
         icacls.exe "$env:ProgramData\ssh\administrators_authorized_keys" /inheritance:r /grant "Administrators:F" /grant "SYSTEM:F"
     }
-    else
-    {
-        Write-Host "`nTrusted admin keys already exist"
-    }
 
     if (-NOT (Test-Path "$env:ProgramFiles\PowerShell\7\"))
     {
diff --git a/l4ping/l4ping.Config.json b/l4ping/l4ping.Config.json
index 54a08ef..5a6455d 100644
--- a/l4ping/l4ping.Config.json
+++ b/l4ping/l4ping.Config.json
@@ -22,7 +22,7 @@
 
     "L4pingContainer":
     {
-        "Iterations"        : 5,
+        "Iterations"        : 3,
         "StartPort"         : 50000,
         "ClientSendSize"    : 4,
         "ClientReceiveSize" : 4,
diff --git a/ntttcp/ntttcp.Config.json b/ntttcp/ntttcp.Config.json
index 6b47454..035d450 100644
--- a/ntttcp/ntttcp.Config.json
+++ b/ntttcp/ntttcp.Config.json
@@ -80,17 +80,17 @@
     },
 
     "NtttcpContainer": {
-        "Iterations" : 5,
+        "Iterations" : 3,
         "StartPort"  : 50000,
         "tcp" : {
             "BufferLen"     : [65536],
-            "Connections"   : [64, 128],
+            "Connections"   : [64],
             "OutstandingIo" :[16],
             "Options": "-ns"
         },
         "udp" : {
             "BufferLen"     : [1372],
-            "Connections"   : [64, 128],
+            "Connections"   : [64],
             "OutstandingIo" : null,
             "Options"       : "-ns"
         },
@@ -98,8 +98,7 @@
         "Cooldown" : 2,
         "Runtime"  : 90
     },
-
-    "NtttcpFrag": {
+    "NtttcpTcp": {
         "Iterations" : 5,
         "StartPort"  : 50000,
         "tcp" : {
@@ -108,8 +107,17 @@
             "OutstandingIo" :[16],
             "Options": "-sp"
         },
+        "udp" : null,
+        "Warmup"   : 2,
+        "Cooldown" : 2,
+        "Runtime"  : 90
+    },
+    "NtttcpUdp": {
+        "Iterations" : 5,
+        "StartPort"  : 50000,
+        "tcp" : null,
         "udp" : {
-            "BufferLen"     : [512, 1024, 1372],
+            "BufferLen"     : [1372],
             "Connections"   : [64],
             "OutstandingIo" : null,
             "Options"       : "-sp"
diff --git a/secnetperf/secnetperf.Config.json b/secnetperf/secnetperf.Config.json
index 61cb9d9..462e274 100644
--- a/secnetperf/secnetperf.Config.json
+++ b/secnetperf/secnetperf.Config.json
@@ -46,7 +46,7 @@
         }
     },
     "SecnetperfContainer": {
-        "Iterations": 5,
+        "Iterations": 3,
         "StartPort": 50000,
         "TestType" : {
             "Latency": {