diff --git a/docs/source/index.rst b/docs/source/index.rst
index 585de35..2f23dde 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -95,6 +95,8 @@
            C-Tag starting value, each ONU will get a sequential one (targeting 1024 ONUs per BBSim instance the range is big enough) (default 900)
      -cpuprofile string
            write cpu profile to file
+     -delay int
+           The delay between ONU DISCOVERY batches in milliseconds (1 ONU per each PON PORT at a time (default 200)
      -dhcp
            Set this flag if you want DHCP to start automatically
      -logCaller
diff --git a/internal/common/options.go b/internal/common/options.go
index af51fed..56acf21 100644
--- a/internal/common/options.go
+++ b/internal/common/options.go
@@ -59,7 +59,7 @@
 	logLevel := flag.String("logLevel", "debug", "Set the log level (trace, debug, info, warn, error)")
 	logCaller := flag.Bool("logCaller", false, "Whether to print the caller filename or not")
 
-	dhcpDelay := flag.Int("dhcp_delay", 200, "The delay between ONU DISCOVERY batches in milliseconds (1 ONU per each PON PORT at a time")
+	delay := flag.Int("delay", 200, "The delay between ONU DISCOVERY batches in milliseconds (1 ONU per each PON PORT at a time")
 
 	flag.Parse()
 
@@ -76,7 +76,7 @@
 	o.LogCaller = *logCaller
 	o.Auth = *auth
 	o.Dhcp = *dhcp
-	o.Delay = *dhcpDelay
+	o.Delay = *delay
 
 	return o
 }
diff --git a/tests/bbr.groovy b/tests/bbr.groovy
index 39a0403..104b750 100644
--- a/tests/bbr.groovy
+++ b/tests/bbr.groovy
@@ -80,6 +80,34 @@
         }
       }
     }
+    stage('512 ONUs (64 ONU x 8 PONs)') {
+      steps {
+        timeout(1) {
+          sh """
+            docker rm -f bbsim || true
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-auth -dhcp -pon 8 -onu 64" make docker-run
+            sleep 5
+            ./bbr -pon 8 -onu 64 -logfile bbr_64_8.logs
+            docker logs bbsim 2>&1 | tee bbsim_64_8.logs
+            res=\$(cat bbr_64_8.logs | grep Duration | awk '{print \$5}' ); printf "Runtime\n\${res:9:10}" > bbr_64_8.txt
+          """
+        }
+      }
+    }
+    stage('960 ONUs (64 ONU x 15 PONs)') {
+      steps {
+        timeout(1) {
+          sh """
+            docker rm -f bbsim || true
+            DOCKER_REPOSITORY=voltha/ DOCKER_TAG=master DOCKER_RUN_ARGS="-auth -dhcp -pon 15 -onu 64" make docker-run
+            sleep 5
+            ./bbr -pon 15 -onu 64 -logfile bbr_64_15.logs
+            docker logs bbsim 2>&1 | tee bbsim_64_15.logs
+            res=\$(cat bbr_64_15.logs | grep Duration | awk '{print \$5}' ); printf "Runtime\n\${res:9:10}" > bbr_64_15.txt
+          """
+        }
+      }
+    }
   }
   post {
     always {
@@ -108,6 +136,20 @@
         title: '256 ONUs (32 ONUs x 8 PONs)',
         style: 'line'
       ])
+      plot([
+        csvFileName: 'plot-bbr_64_8.csv',
+        csvSeries: [[file: 'bbr_64_8.txt']],
+        group: 'BBSim',
+        title: '512 ONUs (64 ONUs x 8 PONs)',
+        style: 'line'
+      ])
+      plot([
+        csvFileName: 'plot-bbr_64_15.csv',
+        csvSeries: [[file: 'bbr_64_15.txt']],
+        group: 'BBSim',
+        title: '960 ONUs (64 ONUs x 15 PONs)',
+        style: 'line'
+      ])
     }
     failure {
       sh '''
diff --git a/vendor/.gitignore b/vendor/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/vendor/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore