diff --git a/tests/.gitignore b/tests/.gitignore
index d0bc0d66b343fcc3e240bfbcf4eb4d1a286f25a5..9d5272bf2cb978c455ae030e304f3b24d5a976f4 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -36,4 +36,5 @@
 /string/strrchr
 /string/strspn
 /unlink
+/unlink.out
 /write
diff --git a/tests/expected/alloc.stdout b/tests/expected/alloc.stdout
index 74753f94e3cfa3f1e9b0374f2f82e4dff032316f..e6f5022ade16576e46d611632163d82875ad4734 100644
--- a/tests/expected/alloc.stdout
+++ b/tests/expected/alloc.stdout
@@ -1,2 +1,2 @@
-malloc 0x55ac6c472618
-calloc 0x55ac6c472618
+malloc 0x560fde600618
+calloc 0x560fde600618
diff --git a/tests/expected/getid.stdout b/tests/expected/getid.stdout
index a51fd84a302264be258b90f328bf59ade1eacb18..5ef0956cf2c19e199dd9bec80ebd7fad7d05ad8a 100644
--- a/tests/expected/getid.stdout
+++ b/tests/expected/getid.stdout
@@ -1 +1 @@
-egid: 1000, euid: 1000, gid: 1000, pgid: 23916, pid: 23933, ppid 23918, uid 1000
+egid: 1000, euid: 1000, gid: 1000, pgid: 31979, pid: 32027, ppid 31982, uid 1000
diff --git a/tests/expected/link.stderr b/tests/expected/link.stderr
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..77bae796be4e0982a074f9e15bc5baabf261addc 100644
--- a/tests/expected/link.stderr
+++ b/tests/expected/link.stderr
@@ -0,0 +1 @@
+link: File exists
diff --git a/tests/expected/mem.stderr b/tests/expected/mem.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/expected/mem.stdout b/tests/expected/mem.stdout
new file mode 100644
index 0000000000000000000000000000000000000000..d2f4e1f86ec9b2367d23dbc1c82b655439e1e757
--- /dev/null
+++ b/tests/expected/mem.stdout
@@ -0,0 +1,3 @@
+# mem #
+Correct memchr
+Correct memccpy
diff --git a/tests/expected/setid.stderr b/tests/expected/setid.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/expected/setid.stdout b/tests/expected/setid.stdout
new file mode 100644
index 0000000000000000000000000000000000000000..269cd844e68e403962387798abe06693ee97b2f1
--- /dev/null
+++ b/tests/expected/setid.stdout
@@ -0,0 +1,3 @@
+32050 belongs to process group 32050
+32050 has egid 1000 and gid 1000
+32050 has euid 1000 and uid 1000
diff --git a/tests/expected/sleep.stderr b/tests/expected/sleep.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..df935fdb39f9f41840a583e4fdec38abea5c601a
--- /dev/null
+++ b/tests/expected/sleep.stderr
@@ -0,0 +1,3 @@
+sleep: Success
+usleep: Success
+nanosleep: Success
diff --git a/tests/expected/sleep.stdout b/tests/expected/sleep.stdout
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/expected/sprintf.stderr b/tests/expected/sprintf.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/expected/sprintf.stdout b/tests/expected/sprintf.stdout
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/expected/stdlib/a64l.stderr b/tests/expected/stdlib/a64l.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/expected/stdlib/a64l.stdout b/tests/expected/stdlib/a64l.stdout
new file mode 100644
index 0000000000000000000000000000000000000000..18c83b1ed91bcb0e0f21533435e84e0299fca763
--- /dev/null
+++ b/tests/expected/stdlib/a64l.stdout
@@ -0,0 +1,2 @@
+Correct a64l: azAZ9. = 194301926
+Correct a64l: azA = 53222
diff --git a/tests/expected/stdlib/strtol.stderr b/tests/expected/stdlib/strtol.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/expected/stdlib/strtol.stdout b/tests/expected/stdlib/strtol.stdout
new file mode 100644
index 0000000000000000000000000000000000000000..6f53efcf016a5266713fea60f59ee08b7ec08180
--- /dev/null
+++ b/tests/expected/stdlib/strtol.stdout
@@ -0,0 +1,12 @@
+-42
+555
+1234567890
+-42
+555
+1234567890
+38acf
+abcdef12
+731
+731
+0
+0
diff --git a/tests/expected/string/strchr.stderr b/tests/expected/string/strchr.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/expected/string/strchr.stdout b/tests/expected/string/strchr.stdout
new file mode 100644
index 0000000000000000000000000000000000000000..5a72f0ea5c79b91a7f2263eca9295643f818f052
--- /dev/null
+++ b/tests/expected/string/strchr.stdout
@@ -0,0 +1,3 @@
+ello
+ld
+
diff --git a/tests/expected/string/strcspn.stderr b/tests/expected/string/strcspn.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/expected/string/strcspn.stdout b/tests/expected/string/strcspn.stdout
new file mode 100644
index 0000000000000000000000000000000000000000..2b24e3127788ab5dd07d265a75dd56cfd6c495b8
--- /dev/null
+++ b/tests/expected/string/strcspn.stdout
@@ -0,0 +1,2 @@
+2
+6
diff --git a/tests/expected/string/strncmp.stderr b/tests/expected/string/strncmp.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/expected/string/strncmp.stdout b/tests/expected/string/strncmp.stdout
new file mode 100644
index 0000000000000000000000000000000000000000..e385d8a988feac6214a67c2d9f00a627193662a5
--- /dev/null
+++ b/tests/expected/string/strncmp.stdout
@@ -0,0 +1,6 @@
+-97
+-195
+1
+-255
+-2
+0
diff --git a/tests/expected/string/strrchr.stderr b/tests/expected/string/strrchr.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/expected/string/strrchr.stdout b/tests/expected/string/strrchr.stdout
new file mode 100644
index 0000000000000000000000000000000000000000..fdeaa3bc75d219c3cc46ae1dac3ce5cb9adc8b25
--- /dev/null
+++ b/tests/expected/string/strrchr.stdout
@@ -0,0 +1 @@
+strrch PASS, exiting with status code 0
diff --git a/tests/expected/string/strspn.stderr b/tests/expected/string/strspn.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/tests/expected/string/strspn.stdout b/tests/expected/string/strspn.stdout
new file mode 100644
index 0000000000000000000000000000000000000000..54d9c92604bdf51ba30d3337d868def47df2f4fb
--- /dev/null
+++ b/tests/expected/string/strspn.stdout
@@ -0,0 +1,3 @@
+5
+1
+0
diff --git a/tests/expected/unlink.stderr b/tests/expected/unlink.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..19e51d7f6725bb6c3e0b76c64db1151f500299b9
--- /dev/null
+++ b/tests/expected/unlink.stderr
@@ -0,0 +1 @@
+unlink: File exists
diff --git a/tests/expected/unlink.stdout b/tests/expected/unlink.stdout
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391