7 files changed, 118 insertions, 4 deletions
diff --git a/monkey-test/index.yaml b/monkey-test/index.yaml
index f23d69c..5a66efa 100644
--- a/monkey-test/index.yaml
+++ b/monkey-test/index.yaml
@@ -16,5 +16,8 @@
 - group: ecmascript
   description: ECMAScript tests
 
-- group: popular-sites
-  description: Navigate popular web sites
-\ No newline at end of file
+- group: short-internet
+  description: Internet tests that complete quickly
+
+- group: long-internet
+  description: Internet tests that take some time to complete
diff --git a/monkey-test/long-internet.yaml b/monkey-test/long-internet.yaml
new file mode 100644
index 0000000..56675d8
--- /dev/null
+++ b/monkey-test/long-internet.yaml
@@ -0,0 +1,2 @@
+- group: long-internet
+  description: Internet based tests that take an extended period to execute
diff --git a/monkey-test/ns-infrastructure.yaml b/monkey-test/ns-infrastructure.yaml
new file mode 100644
index 0000000..65a20be
--- /dev/null
+++ b/monkey-test/ns-infrastructure.yaml
@@ -0,0 +1,17 @@
+- group: initial
+  description: Basic checks that the browser can start and stop
+
+- group: no-networking
+  description: Tests that require no networking
+
+- group: basic
+  description: Basic tests that fetch from the test server
+
+- group: http-auth
+  description: Test HTTP 401 authentication
+
+- group: https
+  description: Test HTTPS handling
+
+- group: ecmascript
+  description: ECMAScript tests
diff --git a/monkey-test/popular-sites-parallel.yaml b/monkey-test/popular-sites-parallel.yaml
index 576275e..4aee6e5 100644
--- a/monkey-test/popular-sites-parallel.yaml
+++ b/monkey-test/popular-sites-parallel.yaml
@@ -1,5 +1,5 @@
 title: browse and render 50 popular sites in parallel
-group: popular-sites
+group: short-internet
 steps:
 - action: launch
   language: en
diff --git a/monkey-test/popular-sites.yaml b/monkey-test/popular-sites.yaml
index 177eb5b..eec84c9 100644
--- a/monkey-test/popular-sites.yaml
+++ b/monkey-test/popular-sites.yaml
@@ -1,5 +1,5 @@
 title: browse and render 500 popular sites
-group: popular-sites
+group: long-internet
 steps:
 - action: launch
   language: en
diff --git a/monkey-test/short-internet.yaml b/monkey-test/short-internet.yaml
new file mode 100644
index 0000000..d91853c
--- /dev/null
+++ b/monkey-test/short-internet.yaml
@@ -0,0 +1,2 @@
+- group: short-internet
+  description: internet based tests that complete in a short amount of time
diff --git a/monkey-test/short-popular-sites.yaml b/monkey-test/short-popular-sites.yaml
new file mode 100644
index 0000000..3dd2754
--- /dev/null
+++ b/monkey-test/short-popular-sites.yaml
@@ -0,0 +1,90 @@
+title: browse and render 50 popular sites
+group: short-internet
+steps:
+- action: launch
+  language: en
+  options:
+  - enable_javascript=1
+- action: window-new
+  tag: win1
+- action: timer-start
+  timer: totaltimer
+- action: timer-start
+  timer: timer1
+- action: repeat
+  values:
+  - https://www.google.com/
+  - https://www.blogger.com/
+  - https://apple.com/
+  - https://plus.google.com/
+  - https://microsoft.com/
+  - https://play.google.com/
+  - https://adobe.com/
+  - https://youtube.com/
+  - https://mozilla.org/
+  - https://en.wikipedia.org/
+  - https://support.google.com/
+  - https://sites.google.com/
+  - https://accounts.google.com/
+  - https://docs.google.com/
+  - https://wordpress.org/
+  - https://linkedin.com/
+  - https://vimeo.com/
+  - https://maps.google.com/
+  - https://github.com/
+  - https://drive.google.com/
+  - https://youtu.be/
+  - https://creativecommons.org/
+  - https://lh3.googleusercontent.com/Wwr1nDkB0VXEV77DA9mRGHOyfhPLt-_HhrfZAgKPsWuTOPc0TpTgShgQRbcjYlq5U7kwlb_UdmbztKNAkVUWDw2k6TPoYnevqXYkz1gMNgqVJONhwKOqW2au9tUtXX37Asv6xQPkFBjn5FvpziuvoxiWR7s8wbBuirUhaax8GT8WNoqHCLb-Wv1yqdCNX1hQ69xW3v0X_PHvS230mVoc-aBDAXdh9qO1qz4TKi0YtMYQmUpIlDuj1R7kg9ISpaziHaOOdUYfHYLQmodKdbC7ajb5Nt7Am8-02nne2JnD2M77ZH8-UPvBftd5I-jEqBkvbHIwVFxMNkcXGb3eJZEoxfapkPoUVJ5aZtLN9zO47J0oba-iNlMILAAXAkvQvMbZW86aljlaocH-lw2tBs4wyxU2KQ4xeKHQUkivmKruSUaN0Dhzubzdv_56exRjYNFJZYzMaoKbZISdHxHnhhVzTgStyk7CsaBoApxtx33Hv3B1HZ-WQsjJQuzrg3s8N2an03npLYyl8vZtHlcf8FSLmtfaAe-nkFZMUUf4xEfqfzw_0mNbyOTqTUJ-zFThgpPGXshzi6GO3J_oaSQnJ7-YJL57Ke26_lSA2qOIxCoon_VDD5ocRZaUGOmShBDehSN0kIkx7SCFnmQmypoDNzy9dHrQGibXdbs=w812-h633-no
+  - https://vk.com/
+  - https://blogspot.com/
+  - https://news.google.com/
+  - https://medium.com/
+  - https://www.yahoo.com/
+  - https://live.com/
+  - https://istockphoto.com/
+  - https://bbc.co.uk/
+  - https://amazon.com/
+  - https://dailymotion.com/
+  - https://google.es/
+  - https://google.com.br/
+  - https://forbes.com/
+  - https://mediafire.com/
+  - https://wikimedia.org/
+  - https://cloudflare.com/
+  - https://google.de/
+  - https://imdb.com/
+  - https://hugedomains.com/
+  - https://mail.ru/
+  - https://developers.google.com/
+  - https://bbc.com/
+  - https://paypal.com/
+  - https://opera.com/
+  - https://feedburner.com/
+  - https://facebook.com/
+  - https://cnn.com/
+  - https://dropbox.com/
+  - https://whatsapp.com/
+  tag: urls
+  steps:
+  - action: navigate
+    window: win1
+    repeaturl: urls
+  - action: block
+    conditions:
+    - window: win1
+      status: complete
+    - timer: timer1
+      elapsed: 20
+  - action: stop
+    window: win1
+  - action: plot-check
+    window: win1
+  - action: timer-restart
+    timer: timer1
+- action: timer-stop
+  timer: totaltimer
+- action: window-close
+  window: win1
+- action: quit
+