diff --git a/tests/src/kb_cmd.h b/tests/src/kb_cmd.h
index 37c7ea1..ac9a6ac 100644
--- a/tests/src/kb_cmd.h
+++ b/tests/src/kb_cmd.h
@@ -171,9 +171,10 @@ static struct KbCmd endCMD() {
 typedef void (*KeyPressHandler)(struct PS2Buf_t);
 typedef int (*ExecFunc)(struct KbCmd, int *, KeyPressHandler);
 
-static void baseKeyHandler(struct PS2Buf_t kb) {
-    vgaEditor(kb);
-}
+// Commented out to avoid gcc complaining about it being unused
+// static void baseKeyHandler(struct PS2Buf_t kb) {
+//     vgaEditor(kb);
+// }
 
 static int baseExec(struct KbCmd cmd, int *idx, KeyPressHandler kp) {
     switch (cmd.cmd) {
diff --git a/tests/src/test_kb_cmd.c b/tests/src/test_kb_cmd.c
index 1a666fc..a90ecf0 100644
--- a/tests/src/test_kb_cmd.c
+++ b/tests/src/test_kb_cmd.c
@@ -94,12 +94,12 @@ int shiftTest() {
 
 // Word type testing
 int wordTest() {
-    ASSERT(strncmp("test", buff, 5))
+    ASSERT(strncmp("test", buff, 5) == 0)
     return 0;
 }
 
 int complexWordTest() {
-    ASSERT(strncmp("This is a very Loong word$%@^@\\", buff, 32))
+    ASSERT(strncmp("This is a very Loong word$%@^@\\", buff, 32) == 0)
     return 0;
 }
 
@@ -133,10 +133,14 @@ void test_main() {
         // Word type test
         funcCMD(wordTestStart),
         typeWordCMD("test"),
+        funcCMD(wordTest),
         funcCMD(wordTestEnd),
 
+        funcCMD(resetBuff),
+
         funcCMD(complexWordTestStart),
         typeWordCMD("This is a very Loong word$%@^@\\"),
+        funcCMD(complexWordTest),
         funcCMD(complexWordTestEnd),
 
         endCMD(),