diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 3f16df7..967c174 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -5,10 +5,11 @@
             "includePath": [
                 "${workspaceFolder}/utility/unity/core",
                 "${workspaceFolder}/utility/unity/fixture",
+                "${workspaceFolder}/utility/fff",
+                "${workspaceFolder}/test/cmd_parser/helpers/inc",
+                "${workspaceFolder}/cmd_parser",
                 "${workspaceFolder}/test/oled/helpers/inc",
-                "${workspaceFolder}/test/oled/",
-                "${workspaceFolder}/cmd_parser/",
-                "${workspaceFolder}/**"
+                "${workspaceFolder}/oled"
             ],
             "defines": [
                 "_DEBUG",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 49a17dd..b5729a4 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -10,5 +10,8 @@
     "unityExplorer.prettyTestCaseRegex": "test_(\\w+)",
     "unityExplorer.prettyTestFileRegex": "(\\w+)_test\\.c",
     "unityExplorer.debugConfiguration": "Unity Test Explorer Debug",
+    "files.associations": {
+        "main.h": "c"
+    },
     
 }
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b964099..ee587ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,5 +15,5 @@ add_definitions(${GLOBAL_DEFINITION})
 add_subdirectory(utility/unity unity)
 link_libraries(unity)
 
-# add_subdirectory(test/oled oled)
+add_subdirectory(test/oled oled)
 add_subdirectory(test/cmd_parser cmd_parser)
\ No newline at end of file
diff --git a/test/cmd_parser/CMakeLists.txt b/test/cmd_parser/CMakeLists.txt
index 17d415e..27dc14c 100644
--- a/test/cmd_parser/CMakeLists.txt
+++ b/test/cmd_parser/CMakeLists.txt
@@ -9,7 +9,7 @@ set(INCLUDE_DIRS
 )
 
 set(SRCS
-    ../../cmd_parser/cmd_parser2.c
+    ../../cmd_parser/cmd_parser.c
 
     # helpers/src/led_cmd.c
     cmd_parser_test.c
diff --git a/test/cmd_parser/helpers/inc/main.h b/test/cmd_parser/helpers/inc/main.h
deleted file mode 100644
index 20bf192..0000000
--- a/test/cmd_parser/helpers/inc/main.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include <stdint.h>
diff --git a/test/oled/CMakeLists.txt b/test/oled/CMakeLists.txt
index 2e8dfd9..7f23f47 100644
--- a/test/oled/CMakeLists.txt
+++ b/test/oled/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(TEST_NAME oled)
+set(TEST_NAME oled_test)
 
 set(INCLUDE_DIRS
     ../../oled