diff --git a/test161/commands/sync.tc b/test161/commands/sync.tc
new file mode 100644
index 0000000..24e86eb
--- /dev/null
+++ b/test161/commands/sync.tc
@@ -0,0 +1,38 @@
+---
+templates:
+  - name: sem1
+  - name: lt1
+  - name: lt2
+    panics: yes
+    output:
+      - text: "lt2: Should panic..."
+  - name: lt3
+    panics: yes
+    output:
+      - text: "lt3: Should panic..."
+  - name: cvt1
+  - name: cvt2
+  - name: cvt3
+    panics: yes
+    output:
+      - text: "cvt3: Should panic..."
+  - name: cvt4
+    panics: yes
+    output:
+      - text: "cvt4: Should panic..."
+  - name: rwt1
+  - name: rwt2
+  - name: rwt3
+    panics: yes
+    output:
+      - text: "rwt3: Should panic..."
+  - name: rwt4
+    panics: yes
+    output:
+      - text: "rwt4: Should panic..."
+  - name: rwt5
+    panics: yes
+    output:
+      - text: "rwt5: Should panic..."
+  - name: sp1
+  - name: sp2
diff --git a/test161/targets/asst.tt b/test161/targets/asst.tt
new file mode 100644
index 0000000..a0b401c
--- /dev/null
+++ b/test161/targets/asst.tt
@@ -0,0 +1,35 @@
+---
+name: asst1
+version: 1
+points: 50
+type: asst
+kconfig: ASST1
+tests:
+  - id: sync/lt1.t
+    points: 8
+  - id: sync/lt2.t
+    points: 1
+  - id: sync/lt3.t
+    points: 1
+  - id: sync/cvt1.t
+    points: 4
+  - id: sync/cvt2.t
+    points: 4
+  - id: sync/cvt3.t
+    points: 1
+  - id: sync/cvt4.t
+    points: 1
+  - id: sync/rwt1.t
+    points: 5
+  - id: sync/rwt2.t
+    points: 2
+  - id: sync/rwt3.t
+    points: 1
+  - id: sync/rwt4.t
+    points: 1
+  - id: sync/rwt5.t
+    points: 1
+  - id: syncprobs/sp1.t
+    points: 10
+  - id: syncprobs/sp2.t
+    points: 10
diff --git a/test161/tests/boot.t b/test161/tests/boot.t
new file mode 100644
index 0000000..070dcc9
--- /dev/null
+++ b/test161/tests/boot.t
@@ -0,0 +1,11 @@
+---
+name: Kernel Boot
+tags:
+ - boot
+stat:
+    resolution: 0.01
+    window: 100
+misc:
+    prompttimeout: 30.0
+---
+q
diff --git a/test161/tests/sync/cvt1.t b/test161/tests/sync/cvt1.t
new file mode 100644
index 0000000..5824af9
--- /dev/null
+++ b/test161/tests/sync/cvt1.t
@@ -0,0 +1,9 @@
+---
+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
new file mode 100644
index 0000000..517955f
--- /dev/null
+++ b/test161/tests/sync/cvt2.t
@@ -0,0 +1,9 @@
+---
+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
new file mode 100644
index 0000000..1928deb
--- /dev/null
+++ b/test161/tests/sync/cvt3.t
@@ -0,0 +1,9 @@
+---
+name: "CV Test 3"
+tags:
+ - sync
+ - cv
+depends:
+ - boot
+---
+cvt3
diff --git a/test161/tests/sync/cvt4.t b/test161/tests/sync/cvt4.t
new file mode 100644
index 0000000..8de27d9
--- /dev/null
+++ b/test161/tests/sync/cvt4.t
@@ -0,0 +1,9 @@
+---
+name: "CV Test 4"
+tags:
+ - sync
+ - cv
+depends:
+ - boot
+---
+cvt4
diff --git a/test161/tests/sync/lt1.t b/test161/tests/sync/lt1.t
new file mode 100644
index 0000000..6a7f1ca
--- /dev/null
+++ b/test161/tests/sync/lt1.t
@@ -0,0 +1,9 @@
+---
+name: "Lock Test 1"
+tags:
+ - sync
+ - locks
+depends:
+ - boot
+---
+lt1
diff --git a/test161/tests/sync/lt2.t b/test161/tests/sync/lt2.t
new file mode 100644
index 0000000..74ef0af
--- /dev/null
+++ b/test161/tests/sync/lt2.t
@@ -0,0 +1,9 @@
+---
+name: "Lock Test 2"
+tags:
+ - sync
+ - locks
+depends:
+ - boot
+---
+lt2
diff --git a/test161/tests/sync/lt3.t b/test161/tests/sync/lt3.t
new file mode 100644
index 0000000..6f35c2b
--- /dev/null
+++ b/test161/tests/sync/lt3.t
@@ -0,0 +1,9 @@
+---
+name: "Lock Test 3"
+tags:
+ - sync
+ - locks
+depends:
+ - boot
+---
+lt3
diff --git a/test161/tests/sync/rwt1.t b/test161/tests/sync/rwt1.t
new file mode 100644
index 0000000..be096a1
--- /dev/null
+++ b/test161/tests/sync/rwt1.t
@@ -0,0 +1,9 @@
+---
+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
new file mode 100644
index 0000000..aff7e83
--- /dev/null
+++ b/test161/tests/sync/rwt2.t
@@ -0,0 +1,9 @@
+---
+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
new file mode 100644
index 0000000..4e4118a
--- /dev/null
+++ b/test161/tests/sync/rwt3.t
@@ -0,0 +1,9 @@
+---
+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
new file mode 100644
index 0000000..1405aca
--- /dev/null
+++ b/test161/tests/sync/rwt4.t
@@ -0,0 +1,9 @@
+---
+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
new file mode 100644
index 0000000..2bc2791
--- /dev/null
+++ b/test161/tests/sync/rwt5.t
@@ -0,0 +1,9 @@
+---
+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
new file mode 100644
index 0000000..2393683
--- /dev/null
+++ b/test161/tests/sync/sem1.t
@@ -0,0 +1,9 @@
+---
+name: "Semaphore Test"
+tags:
+ - sync
+ - semaphore
+depends:
+ - boot
+---
+sem1
diff --git a/test161/tests/syncprobs/sp1.t b/test161/tests/syncprobs/sp1.t
new file mode 100644
index 0000000..61ba2b2
--- /dev/null
+++ b/test161/tests/syncprobs/sp1.t
@@ -0,0 +1,10 @@
+---
+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
new file mode 100644
index 0000000..ce5ee62
--- /dev/null
+++ b/test161/tests/syncprobs/sp2.t
@@ -0,0 +1,10 @@
+---
+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
new file mode 100644
index 0000000..8ffc74e
--- /dev/null
+++ b/test161/tests/threads/tt1.t
@@ -0,0 +1,8 @@
+---
+name: "Thread Test 1"
+tags:
+ - threads
+depends:
+ - boot
+---
+tt1
diff --git a/test161/tests/threads/tt2.t b/test161/tests/threads/tt2.t
new file mode 100644
index 0000000..82b1f1c
--- /dev/null
+++ b/test161/tests/threads/tt2.t
@@ -0,0 +1,8 @@
+---
+name: "Thread Test 2"
+tags:
+ - threads
+depends:
+ - boot
+---
+tt2
diff --git a/test161/tests/threads/tt3.t b/test161/tests/threads/tt3.t
new file mode 100644
index 0000000..47540f2
--- /dev/null
+++ b/test161/tests/threads/tt3.t
@@ -0,0 +1,8 @@
+---
+name: "Thread Test 3"
+tags:
+ - threads
+depends:
+ - boot
+---
+tt3