diff --git a/test161/targets/asst2.tt b/test161/targets/asst2.tt
index 8e9c8c5..8e3553d 100644
--- a/test161/targets/asst2.tt
+++ b/test161/targets/asst2.tt
@@ -5,7 +5,7 @@ type: asst
 kconfig: ASST2
 userland: true
 tests:
-# Make sure the console works
+# Make sure the console works (10 points)
   - id: syscalls/consoletest.t
     points: 10
 # File system system calls (50 points)
@@ -35,26 +35,26 @@ tests:
   - id: syscalls/add.t
     points: 5
 # Stability tests (40 points)
-# Bad calls
+# Bad calls (10 points)
   - id: stability/badcall/badcall-open.t
-    points: 3
+    points: 1
   - id: stability/badcall/badcall-close.t
-    points: 3
+    points: 1
   - id: stability/badcall/badcall-read.t
-    points: 3
+    points: 1
   - id: stability/badcall/badcall-write.t
-    points: 3
+    points: 1
   - id: stability/badcall/badcall-lseek.t
-    points: 3
+    points: 1
   - id: stability/badcall/badcall-dup2.t
-    points: 3
+    points: 1
   - id: stability/badcall/badcall-execv.t
-    points: 5
+    points: 2
   - id: stability/badcall/badcall-waitpid.t
-    points: 5
+    points: 2
 # crash
   - id: stability/crash/crash-allS.t
-    points: 2
+    points: 5
 # randcall
   - id: stability/randcall.t
     points: 5
@@ -63,11 +63,11 @@ tests:
         args:
           - "-f"
           - "-c 100"
-          - "-r {{randInt 1 4294967295}}"
+          - "-r 421"
           - "2"
 # forkbomb
   - id: stability/forkbomb.t
     points: 10
 # forktest
   - id: stability/forktest-stability.t
-    points: 5
+    points: 10
diff --git a/test161/tests/stability/badcall/badcall-close.t b/test161/tests/stability/badcall/badcall-close.t
index ba2ac4e..df3be43 100644
--- a/test161/tests/stability/badcall/badcall-close.t
+++ b/test161/tests/stability/badcall/badcall-close.t
@@ -1,9 +1,8 @@
 ---
-name: "Badcall-close Test"
+name: "Bad Close"
 description:
-  Tests whether close syscall is implemented correctly by invoking it in all
-  possible wrong ways.
-tags: [badcall, stability]
+  Stability test for sys_close.
+tags: [badcall,stability]
 depends: [shell]
 ---
 $ /testbin/badcall f
diff --git a/test161/tests/stability/badcall/badcall-dup2.t b/test161/tests/stability/badcall/badcall-dup2.t
index 7965c70..81da95b 100644
--- a/test161/tests/stability/badcall/badcall-dup2.t
+++ b/test161/tests/stability/badcall/badcall-dup2.t
@@ -1,9 +1,8 @@
 ---
-name: "Badcall-dup2 Test"
+name: "Bad Dup"
 description:
-  Tests whether dup2 syscall is implemented correctly by invoking it in all
-  possible wrong ways.
-tags: [badcall, stability]
+  Stability test for sys_dup2.
+tags: [badcall,stability]
 depends: [shell]
 ---
 $ /testbin/badcall w
diff --git a/test161/tests/stability/badcall/badcall-execv.t b/test161/tests/stability/badcall/badcall-execv.t
index 0e74dbe..a2dc740 100644
--- a/test161/tests/stability/badcall/badcall-execv.t
+++ b/test161/tests/stability/badcall/badcall-execv.t
@@ -1,11 +1,10 @@
 ---
-name: "Badcall-execv Test"
+name: "Bad Exec"
 description:
-  Tests whether execv syscall is implemented correctly by invoking it in all
-  possible wrong ways.
-tags: [badcall, stability]
+  Stability test for sys_exec.
+tags: [badcall,stability]
 depends: [shell]
 sys161:
-  ram: 4M
+  ram: 512K
 ---
 $ /testbin/badcall a
diff --git a/test161/tests/stability/badcall/badcall-lseek.t b/test161/tests/stability/badcall/badcall-lseek.t
index 404be2a..06ef54b 100644
--- a/test161/tests/stability/badcall/badcall-lseek.t
+++ b/test161/tests/stability/badcall/badcall-lseek.t
@@ -1,9 +1,10 @@
 ---
-name: "Badcall-lseek Test"
+name: "Bad Seek"
 description:
-  Tests whether lseek syscall is implemented correctly by invoking it in all
-  possible wrong ways.
-tags: [badcall, stability]
+  Stability test for sys_lseek.
+tags: [badcall,stability]
 depends: [shell]
+sys161:
+  ram: 512K
 ---
 $ /testbin/badcall j
diff --git a/test161/tests/stability/badcall/badcall-open.t b/test161/tests/stability/badcall/badcall-open.t
index fc1daa3..3c6accd 100644
--- a/test161/tests/stability/badcall/badcall-open.t
+++ b/test161/tests/stability/badcall/badcall-open.t
@@ -1,9 +1,10 @@
 ---
-name: "Badcall-open Test"
+name: "Bad Open"
 description:
-  Tests whether open syscall is implemented correctly by invoking it in all
-  possible wrong ways.
-tags: [badcall, stability]
+  Stability test for sys_open.
+tags: [badcall,stability]
 depends: [shell]
+sys161:
+  ram: 512K
 ---
 $ /testbin/badcall c
diff --git a/test161/tests/stability/badcall/badcall-read.t b/test161/tests/stability/badcall/badcall-read.t
index 6cf608f..905196a 100644
--- a/test161/tests/stability/badcall/badcall-read.t
+++ b/test161/tests/stability/badcall/badcall-read.t
@@ -1,9 +1,8 @@
 ---
-name: "Badcall-read Test"
+name: "Bad Read"
 description:
-  Tests whether read syscall is implemented correctly by invoking it in all
-  possible wrong ways.
-tags: [badcall, stability]
+  Stability test for sys_read.
+tags: [badcall,stability]
 depends: [shell]
 ---
 $ /testbin/badcall d
diff --git a/test161/tests/stability/badcall/badcall-waitpid.t b/test161/tests/stability/badcall/badcall-waitpid.t
index 0b2038e..a99775d 100644
--- a/test161/tests/stability/badcall/badcall-waitpid.t
+++ b/test161/tests/stability/badcall/badcall-waitpid.t
@@ -1,11 +1,10 @@
 ---
-name: "Badcall-waitpid Test"
+name: "Bad Wait"
 description:
-  Tests whether waitpid syscall is implemented correctly by invoking it in all
-  possible wrong ways.
-tags: [badcall, stability]
+  Stability test for sys_wait.
+tags: [badcall,stability]
 depends: [shell]
 sys161:
-  ram: 4M
+  ram: 512K
 ---
 $ /testbin/badcall b
diff --git a/test161/tests/stability/badcall/badcall-write.t b/test161/tests/stability/badcall/badcall-write.t
index 77be1ad..2847766 100644
--- a/test161/tests/stability/badcall/badcall-write.t
+++ b/test161/tests/stability/badcall/badcall-write.t
@@ -1,9 +1,10 @@
 ---
-name: "Badcall-write Test"
+name: "Bad Write"
 description:
-  Tests whether write syscall is implemented correctly by invoking it in all
-  possible wrong ways.
-tags: [badcall, stability]
+  Stability test for sys_write.
+tags: [badcall,stability]
 depends: [shell]
+sys161:
+  ram: 512K
 ---
 $ /testbin/badcall e
diff --git a/test161/tests/stability/crash/crash-allS.t b/test161/tests/stability/crash/crash-allS.t
index 54cf02e..088f2d9 100644
--- a/test161/tests/stability/crash/crash-allS.t
+++ b/test161/tests/stability/crash/crash-allS.t
@@ -1,12 +1,10 @@
 ---
-name: "Crash-all Shell Test"
-description:
-  Tests whether your system correctly handles a variety of
-  illegal attempts from userspace processes to access resources that
-  do not belong to it. Please see userland/testbin/crash for more info.
-  Runs it from the shell.
-tags: [stability, crash, crash-fork]
-depends: [shell, /asst2/process/forktest.t]
+name: "Crash"
+description: >
+  Tests whether your system correctly handles a variety of bad process
+  behavior.
+tags: [crash,stability]
+depends: [shell,sys_fork]
 sys161:
   ram: 4M
 ---
diff --git a/test161/tests/stability/forkbomb.t b/test161/tests/stability/forkbomb.t
index 7b82941..63ec9ce 100644
--- a/test161/tests/stability/forkbomb.t
+++ b/test161/tests/stability/forkbomb.t
@@ -1,5 +1,5 @@
 ---
-name: "Forkbomb"
+name: "Calm Like a Fork Bomb"
 tags: [stability]
 depends: [console]
 sys161:
diff --git a/test161/tests/stability/forktest-stability.t b/test161/tests/stability/forktest-stability.t
index f30d0fc..0ac6d20 100644
--- a/test161/tests/stability/forktest-stability.t
+++ b/test161/tests/stability/forktest-stability.t
@@ -1,9 +1,9 @@
 ---
-name: "Forktest Stability Test"
+name: "Fork Stability Test"
 description:
   Runs forktest 5 times to check for synchronization issues.
 tags: [stability]
-depends: [shell, /asst2/process/forktest.t]
+depends: [shell]
 sys161:
   ram: 16M
 ---
diff --git a/test161/tests/stability/randcall.t b/test161/tests/stability/randcall.t
index a9c60c1..271ea0f 100644
--- a/test161/tests/stability/randcall.t
+++ b/test161/tests/stability/randcall.t
@@ -1,12 +1,10 @@
 ---
 name: "Randcall Test"
-description:
-  Invokes system calls on random with random arguments.
-  Tests whether your system can gracefully recover from
-  bad system calls.
-tags: [randcall-2, stability]
+description: >
+  Invokes system calls with random arguments.
+tags: [stability]
 depends: [shell]
 sys161:
   ram: 16M
 ---
-$ /testbin/randcall -f -c 1000 -r 30 2
+$ /testbin/randcall -f -c 100 -r 421 2
diff --git a/test161/tests/syscalls/add.t b/test161/tests/syscalls/add.t
index 849ee13..9588da0 100644
--- a/test161/tests/syscalls/add.t
+++ b/test161/tests/syscalls/add.t
@@ -2,7 +2,7 @@
 name: "Add Test"
 description:
   Adds two randomly generated numbers.
-tags: [proc, fun]
+tags: [sys_exec,procsyscalls,syscalls]
 depends: [shell]
 ---
 $ /testbin/add
diff --git a/test161/tests/syscalls/argtest.t b/test161/tests/syscalls/argtest.t
index cf6e38b..a0dafeb 100644
--- a/test161/tests/syscalls/argtest.t
+++ b/test161/tests/syscalls/argtest.t
@@ -2,7 +2,7 @@
 name: "Argtest"
 description:
   Checks whether your kernel supports argument passing.
-tags: [argtest, proc]
-depends: [console]
+tags: [sys_exec,procsyscalls,syscalls]
+depends: [shell]
 ---
 $ /testbin/argtest
diff --git a/test161/tests/syscalls/bigexec.t b/test161/tests/syscalls/bigexec.t
index c2b2a40..0614b78 100644
--- a/test161/tests/syscalls/bigexec.t
+++ b/test161/tests/syscalls/bigexec.t
@@ -1,10 +1,10 @@
----
+--
 name: "Bigexec Test"
 description:
   Tests to ensure that the argument passing logic is not hard-coded
   to small argument lengths.
-tags: [proc]
-depends: [shell, /asst2/process/argtest.t]
+tags: [sys_exec,procsyscalls,syscalls]
+depends: [shell]
 sys161:
   ram: 4M
 ---
diff --git a/test161/tests/syscalls/closetest.t b/test161/tests/syscalls/closetest.t
index e7f84a7..43a7401 100644
--- a/test161/tests/syscalls/closetest.t
+++ b/test161/tests/syscalls/closetest.t
@@ -2,8 +2,8 @@
 name: "Close Test"
 description: >
   Tests sys_close by closing STDIN and a normal file.
-tags: [syscalls,filesyscalls]
-depends: [boot, /asst2/fs/opentest.t]
+tags: [sys_close,filesyscalls,syscalls]
+depends: [console,sys_open]
 sys161:
   ram: 512K
 ---
diff --git a/test161/tests/syscalls/factorial.t b/test161/tests/syscalls/factorial.t
index b1aaea1..db7cd68 100644
--- a/test161/tests/syscalls/factorial.t
+++ b/test161/tests/syscalls/factorial.t
@@ -3,7 +3,7 @@ name: "Factorial Test"
 description:
   Attempts to calculate factorial by recursive replacing the current process
   with the number computed thus far.
-tags: [proc, fun]
+tags: [sys_exec,procsyscalls,syscalls]
 depends: [shell]
 sys161:
   ram: 4M
diff --git a/test161/tests/syscalls/fileonlytest.t b/test161/tests/syscalls/fileonlytest.t
index 9e6d796..3d083bb 100644
--- a/test161/tests/syscalls/fileonlytest.t
+++ b/test161/tests/syscalls/fileonlytest.t
@@ -5,8 +5,8 @@ description: >
   bytes, skips 512 bytes and writes another 512 bytes (odd steps). Seeks
   back to beginning and writes the even steps. Then seeks back to the
   beginning and verifies that the contents are correct.
-tags: [syscalls,filesyscalls]
-depends: [console, /asst2/fs/readwritetest.t,]
+tags: [filesyscalls,syscalls]
+depends: [console]
 sys161:
   ram: 512K
 ---
diff --git a/test161/tests/syscalls/forktest.t b/test161/tests/syscalls/forktest.t
index 660ef5a..5eaa292 100644
--- a/test161/tests/syscalls/forktest.t
+++ b/test161/tests/syscalls/forktest.t
@@ -2,8 +2,8 @@
 name: "Fork Test"
 description: >
   Test that fork works.
-tags: [syscalls,procsyscalls]
-depends: [console,/asst2/fs/readwritetest.t]
+tags: [sys_fork,procsyscalls,syscalls]
+depends: [console]
 sys161:
   ram: 4M
 ---
diff --git a/test161/tests/syscalls/opentest.t b/test161/tests/syscalls/opentest.t
index da1993d..119c135 100644
--- a/test161/tests/syscalls/opentest.t
+++ b/test161/tests/syscalls/opentest.t
@@ -2,8 +2,8 @@
 name: "Open Test"
 description: >
   Tests sys_open by attempting to open an existing file.
-tags: [syscalls,filesyscalls]
-depends: [boot]
+tags: [sys_open,filesyscalls,syscalls]
+depends: [console]
 sys161:
   ram: 512K
 ---
diff --git a/test161/tests/syscalls/readwritetest.t b/test161/tests/syscalls/readwritetest.t
index 6ef808c..d3116a1 100644
--- a/test161/tests/syscalls/readwritetest.t
+++ b/test161/tests/syscalls/readwritetest.t
@@ -2,8 +2,8 @@
 name: "Read and Write Test"
 description: >
   Tests sys_read and sys_write by reading and writing to a file.
-tags: [syscalls,filesyscalls]
-depends: [/asst2/fs/opentest.t]
+tags: [sys_read,sys_write,filesyscalls,syscalls]
+depends: [console,sys_open]
 sys161:
   ram: 512K
 ---
diff --git a/test161/tests/syscalls/redirect.t b/test161/tests/syscalls/redirect.t
index a22c749..9811d6e 100644
--- a/test161/tests/syscalls/redirect.t
+++ b/test161/tests/syscalls/redirect.t
@@ -3,9 +3,9 @@ name: "Redirect Test"
 description: >
   Tests sys_dup2. Opens a file handle, then forks a new process which
   manipulates the file table.
-tags: [syscalls,filesyscalls]
-depends: [/asst2/process/forktest.t]
+tags: [sys_dup2,filesyscalls,syscalls]
+depends: [console,sys_fork]
 sys161:
-  ram: 512K
+  ram: 1M
 ---
 p /testbin/redirect
diff --git a/test161/tests/syscalls/shell.t b/test161/tests/syscalls/shell.t
index 5284039..053015c 100644
--- a/test161/tests/syscalls/shell.t
+++ b/test161/tests/syscalls/shell.t
@@ -4,10 +4,10 @@ description:
   Tests whether the shell works by running /testbin/consoletest in the shell.
   The shell test tries to identify a race condition between the shell and the
   program that the shell is trying to run.
-tags: [syscalls,procsyscalls,shell]
+tags: [shell,procsyscalls,syscalls]
 depends: [console]
 sys161:
-  ram: 2M
+  ram: 1M
 ---
 $ /testbin/shelltest
 $ /testbin/shelltest
diff --git a/test161/tests/syscalls/sparsefile.t b/test161/tests/syscalls/sparsefile.t
index ccd2326..b5a8f3b 100644
--- a/test161/tests/syscalls/sparsefile.t
+++ b/test161/tests/syscalls/sparsefile.t
@@ -3,9 +3,9 @@ name: "Sparsefile Test"
 description: >
   Tests sys_lseek by writing one byte of data after skipping the beginning of
   an empty file and then attempting to read this byte.
-tags: [syscalls,filesyscalls]
-depends: [shell, /asst2/fs/fileonlytest.t]
+tags: [sys_lseek,filesyscalls,syscalls]
+depends: [shell]
 sys161:
-  ram: 512K
+  ram: 1M
 ---
 $ /testbin/sparsefile test 1048