diff --git a/debug.sh b/debug.sh
deleted file mode 100755
index 1ff2809..0000000
--- a/debug.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-cd ./runtime/bin
-export LD_LIBRARY_PATH="$(pwd):$LD_LIBRARY_PATH"
-gdb --eval-command="handle SIGUSR1 nostop" --eval-command="run ../tests/test_fibonacci_multiple.json" ./awsmrt
-cd ../..
diff --git a/runtime/tests/preemption/client1.sh b/runtime/tests/preemption/client1.sh
new file mode 100755
index 0000000..4a26867
--- /dev/null
+++ b/runtime/tests/preemption/client1.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# fib(20)
+# Perhaps this can be improved to pass a body without an additional file
+ab -n 100000 -c 100 -p client1_body.txt -v 4 localhost:10000/
diff --git a/post_body.txt b/runtime/tests/preemption/client1_body.txt
similarity index 100%
rename from post_body.txt
rename to runtime/tests/preemption/client1_body.txt
diff --git a/runtime/tests/preemption/client2.sh b/runtime/tests/preemption/client2.sh
new file mode 100755
index 0000000..d38e10a
--- /dev/null
+++ b/runtime/tests/preemption/client2.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# fib(10)
+# Perhaps this can be improved to pass a body without an additional file
+ab -n 100000 -c 100 -p client2_body.txt -v 4 localhost:10001/
diff --git a/post_body2.txt b/runtime/tests/preemption/client2_body.txt
similarity index 100%
rename from post_body2.txt
rename to runtime/tests/preemption/client2_body.txt
diff --git a/runtime/tests/preemption/debug.sh b/runtime/tests/preemption/debug.sh
new file mode 100755
index 0000000..4588c77
--- /dev/null
+++ b/runtime/tests/preemption/debug.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Executes the runtime in GDB with SIGU
+
+cd ../../bin
+export LD_LIBRARY_PATH="$(pwd):$LD_LIBRARY_PATH"
+gdb --eval-command="handle SIGUSR1 nostop" --eval-command="run ../tests/preemption/test_fibonacci_multiple.json" ./awsmrt
+cd ../../tests
diff --git a/demo.txt b/runtime/tests/preemption/demo.txt
similarity index 100%
rename from demo.txt
rename to runtime/tests/preemption/demo.txt
diff --git a/runtime/tests/test_fibonacci.json b/runtime/tests/preemption/test_fibonacci.json
similarity index 100%
rename from runtime/tests/test_fibonacci.json
rename to runtime/tests/preemption/test_fibonacci.json
diff --git a/runtime/tests/test_fibonacci_multiple.json b/runtime/tests/preemption/test_fibonacci_multiple.json
similarity index 100%
rename from runtime/tests/test_fibonacci_multiple.json
rename to runtime/tests/preemption/test_fibonacci_multiple.json