diff --git a/test161/targets/asst1.tt b/test161/targets/asst1.tt
index b7e18a4..a41273c 100644
--- a/test161/targets/asst1.tt
+++ b/test161/targets/asst1.tt
@@ -4,31 +4,31 @@ points: 50
 type: asst
 kconfig: ASST1
 tests:
-  - id: sync/lt1.t
+  - id: synch/lt1.t
     points: 8
-  - id: sync/lt2.t
+  - id: synch/lt2.t
     points: 1
-  - id: sync/lt3.t
+  - id: synch/lt3.t
     points: 1
-  - id: sync/cvt1.t
+  - id: synch/cvt1.t
     points: 4
-  - id: sync/cvt2.t
+  - id: synch/cvt2.t
     points: 4
-  - id: sync/cvt3.t
+  - id: synch/cvt3.t
     points: 1
-  - id: sync/cvt4.t
+  - id: synch/cvt4.t
     points: 1
-  - id: sync/rwt1.t
+  - id: synch/rwt1.t
     points: 5
-  - id: sync/rwt2.t
+  - id: synch/rwt2.t
     points: 2
-  - id: sync/rwt3.t
+  - id: synch/rwt3.t
     points: 1
-  - id: sync/rwt4.t
+  - id: synch/rwt4.t
     points: 1
-  - id: sync/rwt5.t
+  - id: synch/rwt5.t
     points: 1
-  - id: syncprobs/sp1.t
+  - id: synchprobs/sp1.t
     points: 10
-  - id: syncprobs/sp2.t
+  - id: synchprobs/sp2.t
     points: 10
diff --git a/test161/tests/sync/cvt1.t b/test161/tests/sync/cvt1.t
deleted file mode 100644
index 5824af9..0000000
--- a/test161/tests/sync/cvt1.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "CV Test 1"
-tags:
- - sync
- - cv
-depends:
- - lt1.t
----
-cvt1
diff --git a/test161/tests/sync/cvt2.t b/test161/tests/sync/cvt2.t
deleted file mode 100644
index 517955f..0000000
--- a/test161/tests/sync/cvt2.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "CV Test 2"
-tags:
- - sync
- - cv
-depends:
- - lt1.t
----
-cvt2
diff --git a/test161/tests/sync/cvt3.t b/test161/tests/sync/cvt3.t
deleted file mode 100644
index 1928deb..0000000
--- a/test161/tests/sync/cvt3.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "CV Test 3"
-tags:
- - sync
- - cv
-depends:
- - boot
----
-cvt3
diff --git a/test161/tests/sync/cvt4.t b/test161/tests/sync/cvt4.t
deleted file mode 100644
index 8de27d9..0000000
--- a/test161/tests/sync/cvt4.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "CV Test 4"
-tags:
- - sync
- - cv
-depends:
- - boot
----
-cvt4
diff --git a/test161/tests/sync/lt1.t b/test161/tests/sync/lt1.t
deleted file mode 100644
index 6a7f1ca..0000000
--- a/test161/tests/sync/lt1.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "Lock Test 1"
-tags:
- - sync
- - locks
-depends:
- - boot
----
-lt1
diff --git a/test161/tests/sync/lt2.t b/test161/tests/sync/lt2.t
deleted file mode 100644
index 74ef0af..0000000
--- a/test161/tests/sync/lt2.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "Lock Test 2"
-tags:
- - sync
- - locks
-depends:
- - boot
----
-lt2
diff --git a/test161/tests/sync/lt3.t b/test161/tests/sync/lt3.t
deleted file mode 100644
index 6f35c2b..0000000
--- a/test161/tests/sync/lt3.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "Lock Test 3"
-tags:
- - sync
- - locks
-depends:
- - boot
----
-lt3
diff --git a/test161/tests/sync/rwt1.t b/test161/tests/sync/rwt1.t
deleted file mode 100644
index be096a1..0000000
--- a/test161/tests/sync/rwt1.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "RW Lock Test 1"
-tags:
- - sync
- - rwlocks
-depends:
- - boot
----
-rwt1
diff --git a/test161/tests/sync/rwt2.t b/test161/tests/sync/rwt2.t
deleted file mode 100644
index aff7e83..0000000
--- a/test161/tests/sync/rwt2.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "RW Lock Test 2"
-tags:
- - sync
- - rwlocks
-depends:
- - boot
----
-rwt2
diff --git a/test161/tests/sync/rwt3.t b/test161/tests/sync/rwt3.t
deleted file mode 100644
index 4e4118a..0000000
--- a/test161/tests/sync/rwt3.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "RW Lock Test 3"
-tags:
- - sync
- - rwlocks
-depends:
- - boot
----
-rwt3
diff --git a/test161/tests/sync/rwt4.t b/test161/tests/sync/rwt4.t
deleted file mode 100644
index 1405aca..0000000
--- a/test161/tests/sync/rwt4.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "RW Lock Test 4"
-tags:
- - sync
- - rwlocks
-depends:
- - boot
----
-rwt4
diff --git a/test161/tests/sync/rwt5.t b/test161/tests/sync/rwt5.t
deleted file mode 100644
index 2bc2791..0000000
--- a/test161/tests/sync/rwt5.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "RW Lock Test 5"
-tags:
- - sync
- - rwlocks
-depends:
- - boot
----
-rwt5
diff --git a/test161/tests/sync/sem1.t b/test161/tests/sync/sem1.t
deleted file mode 100644
index 2393683..0000000
--- a/test161/tests/sync/sem1.t
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: "Semaphore Test"
-tags:
- - sync
- - semaphore
-depends:
- - boot
----
-sem1
diff --git a/test161/tests/synch/cvt1.t b/test161/tests/synch/cvt1.t
new file mode 100644
index 0000000..55e206d
--- /dev/null
+++ b/test161/tests/synch/cvt1.t
@@ -0,0 +1,10 @@
+---
+name: "CV Test 1"
+description:
+  Tests core CV functionality through cyclic waiting.
+tags: [synch, cvs]
+depends: [boot, semaphores, locks]
+sys161:
+  cpus: 32
+---
+cvt1
diff --git a/test161/tests/synch/cvt2.t b/test161/tests/synch/cvt2.t
new file mode 100644
index 0000000..da00f74
--- /dev/null
+++ b/test161/tests/synch/cvt2.t
@@ -0,0 +1,11 @@
+---
+name: "CV Test 2"
+description:
+  Tests core CV functionality through a mixture of sleeping and waking
+  threads.
+tags: [synch, cvs]
+depends: [boot, semaphores, locks]
+sys161:
+  cpus: 32
+---
+cvt2
diff --git a/test161/tests/synch/cvt3.t b/test161/tests/synch/cvt3.t
new file mode 100644
index 0000000..c9b8181
--- /dev/null
+++ b/test161/tests/synch/cvt3.t
@@ -0,0 +1,10 @@
+---
+name: "CV Test 3"
+description:
+  Tests CV error handling. Panics on success.
+tags: [synch, cvs]
+depends: [boot, locks]
+sys161:
+  cpus: 1
+---
+cvt3
diff --git a/test161/tests/synch/cvt4.t b/test161/tests/synch/cvt4.t
new file mode 100644
index 0000000..9f6ecdd
--- /dev/null
+++ b/test161/tests/synch/cvt4.t
@@ -0,0 +1,10 @@
+---
+name: "CV Test 4"
+description:
+  Tests CV error handling. Panics on success.
+tags: [synch, cvs]
+depends: [boot, locks]
+sys161:
+  cpus: 1
+---
+cvt4
diff --git a/test161/tests/synch/lt1.t b/test161/tests/synch/lt1.t
new file mode 100644
index 0000000..a64df15
--- /dev/null
+++ b/test161/tests/synch/lt1.t
@@ -0,0 +1,10 @@
+---
+name: "Lock Test 1"
+description:
+  Tests core lock functionality through modifications to shared state.
+tags: [synch, locks]
+depends: [boot, semaphores]
+sys161:
+  cpus: 32
+---
+lt1
diff --git a/test161/tests/synch/lt2.t b/test161/tests/synch/lt2.t
new file mode 100644
index 0000000..eb464a0
--- /dev/null
+++ b/test161/tests/synch/lt2.t
@@ -0,0 +1,10 @@
+---
+name: "Lock Test 2"
+description:
+  Tests lock error handling. Panics on success.
+tags: [synch, locks]
+depends: [boot]
+sys161:
+  cpus: 1
+---
+lt2
diff --git a/test161/tests/synch/lt3.t b/test161/tests/synch/lt3.t
new file mode 100644
index 0000000..65e4086
--- /dev/null
+++ b/test161/tests/synch/lt3.t
@@ -0,0 +1,10 @@
+---
+name: "Lock Test 3"
+description:
+  Tests lock error handling. Panics on success.
+tags: [synch, locks]
+depends: [boot]
+sys161:
+  cpus: 1
+---
+lt3
diff --git a/test161/tests/synch/rwt1.t b/test161/tests/synch/rwt1.t
new file mode 100644
index 0000000..52c89d5
--- /dev/null
+++ b/test161/tests/synch/rwt1.t
@@ -0,0 +1,11 @@
+---
+name: "RW Lock Test 1"
+description:
+  Tests core reader-writer lock functionality by reading and writing shared
+  state.
+tags: [synch, rwlocks]
+depends: [boot, semaphores]
+sys161:
+  cpus: 32
+---
+rwt1
diff --git a/test161/tests/synch/rwt2.t b/test161/tests/synch/rwt2.t
new file mode 100644
index 0000000..cb2900a
--- /dev/null
+++ b/test161/tests/synch/rwt2.t
@@ -0,0 +1,11 @@
+---
+name: "RW Lock Test 2"
+description:
+  Tests that reader-writer locks allow maximum read concurrency when no
+  writers are waiting.
+tags: [synch, rwlocks]
+depends: [boot, semaphores, cvs]
+sys161:
+  cpus: 32
+---
+rwt2
diff --git a/test161/tests/synch/rwt3.t b/test161/tests/synch/rwt3.t
new file mode 100644
index 0000000..ebaec20
--- /dev/null
+++ b/test161/tests/synch/rwt3.t
@@ -0,0 +1,10 @@
+---
+name: "RW Lock Test 3"
+description:
+  Tests reader-writer lock error handling. Panics on success.
+tags: [synch, rwlocks]
+depends: [boot]
+sys161:
+  cpus: 1
+---
+rwt3
diff --git a/test161/tests/synch/rwt4.t b/test161/tests/synch/rwt4.t
new file mode 100644
index 0000000..390d2ac
--- /dev/null
+++ b/test161/tests/synch/rwt4.t
@@ -0,0 +1,10 @@
+---
+name: "RW Lock Test 4"
+description:
+  Tests reader-writer lock error handling. Panics on success.
+tags: [synch, rwlocks]
+depends: [boot]
+sys161:
+  cpus: 1
+---
+rwt4
diff --git a/test161/tests/synch/rwt5.t b/test161/tests/synch/rwt5.t
new file mode 100644
index 0000000..213e26b
--- /dev/null
+++ b/test161/tests/synch/rwt5.t
@@ -0,0 +1,10 @@
+---
+name: "RW Lock Test 5"
+description:
+  Tests reader-writer lock error handling. Panics on success.
+tags: [synch, rwlocks]
+depends: [boot]
+sys161:
+  cpus: 1
+---
+rwt5
diff --git a/test161/tests/synch/sem1.t b/test161/tests/synch/sem1.t
new file mode 100644
index 0000000..d8b0afc
--- /dev/null
+++ b/test161/tests/synch/sem1.t
@@ -0,0 +1,10 @@
+---
+name: "Semaphore Test"
+description:
+  Tests core semaphore logic through cycling signaling.
+tags: [synch, semaphores]
+depends: [boot]
+sys161:
+  cpus: 32
+---
+sem1
diff --git a/test161/tests/synchprobs/sp1.t b/test161/tests/synchprobs/sp1.t
new file mode 100644
index 0000000..ef33704
--- /dev/null
+++ b/test161/tests/synchprobs/sp1.t
@@ -0,0 +1,6 @@
+---
+name: "Whalemating Test"
+tags: [syncprobs]
+depends: [boot, semaphores, locks]
+---
+sp1
diff --git a/test161/tests/synchprobs/sp2.t b/test161/tests/synchprobs/sp2.t
new file mode 100644
index 0000000..a5ae7c6
--- /dev/null
+++ b/test161/tests/synchprobs/sp2.t
@@ -0,0 +1,6 @@
+---
+name: "Stoplight Test"
+tags: [syncprobs]
+depends: [boot, semaphores, locks, cvs]
+---
+sp2
diff --git a/test161/tests/syncprobs/sp1.t b/test161/tests/syncprobs/sp1.t
deleted file mode 100644
index 61ba2b2..0000000
--- a/test161/tests/syncprobs/sp1.t
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: "Whalemating Test"
-tags:
- - syncprobs
-depends:
- - boot
- - /sync/lt1.t
- - /sync/cvt1.t
----
-sp1
diff --git a/test161/tests/syncprobs/sp2.t b/test161/tests/syncprobs/sp2.t
deleted file mode 100644
index ce5ee62..0000000
--- a/test161/tests/syncprobs/sp2.t
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: "Stoplight Test"
-tags:
- - syncprobs
-depends:
- - boot
- - /sync/lt1.t
- - /sync/cvt1.t
----
-sp2
diff --git a/test161/tests/threads/tt1.t b/test161/tests/threads/tt1.t
index 8ffc74e..7c46fc1 100644
--- a/test161/tests/threads/tt1.t
+++ b/test161/tests/threads/tt1.t
@@ -1,8 +1,6 @@
 ---
 name: "Thread Test 1"
-tags:
- - threads
-depends:
- - boot
+tags: [threads]
+depends: [boot]
 ---
 tt1
diff --git a/test161/tests/threads/tt2.t b/test161/tests/threads/tt2.t
index 82b1f1c..6c70a23 100644
--- a/test161/tests/threads/tt2.t
+++ b/test161/tests/threads/tt2.t
@@ -1,8 +1,6 @@
 ---
 name: "Thread Test 2"
-tags:
- - threads
-depends:
- - boot
+tags: [threads]
+depends: [boot]
 ---
 tt2
diff --git a/test161/tests/threads/tt3.t b/test161/tests/threads/tt3.t
index 47540f2..abdcf82 100644
--- a/test161/tests/threads/tt3.t
+++ b/test161/tests/threads/tt3.t
@@ -1,8 +1,6 @@
 ---
 name: "Thread Test 3"
-tags:
- - threads
-depends:
- - boot
+tags: [threads]
+depends: [boot]
 ---
 tt3