diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8008376..4c3c582 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(/usr/local/include ${Lua53_INCLUDE_DIRS} ${LIBUSB_INCLUDE_DI
 
 list(APPEND SRC_LIB
         src/lib/stb_image.h
-        )
+)
 
 list(APPEND SRC_COM
         src/com/com_image.h
@@ -22,7 +22,7 @@ list(APPEND SRC_COM
         src/com/com_canvas.c
         src/com/com_screen_device.h
         src/com/com_screen_device.c
-        )
+)
 
 list(APPEND SRC_MOD
         src/mod/mod_image.h
@@ -41,7 +41,7 @@ list(APPEND SRC_MOD
         src/mod/mod_usb_explorer.c
         src/mod/mod_screen_dpf.h
         src/mod/mod_screen_dpf.c
-        )
+)
 
 list(APPEND SRC_UTILS
         src/utils/log.h
@@ -50,14 +50,17 @@ list(APPEND SRC_UTILS
         src/utils/lua_utils.c
         src/utils/common_types.h
         src/utils/common_types.c
-        )
+)
 
+#
+# Driver Source Lists
+#
 list(APPEND SRC_DPF_DRIVER
         src/driver/dpf/warp_scsi.h
         src/driver/dpf/warp_scsi.c
         src/driver/dpf/dpf_device.h
         src/driver/dpf/dpf_device.c
-        )
+)
 
 add_compile_definitions(
         LOG_USE_COLOR
@@ -93,13 +96,9 @@ target_link_libraries(ldpf4l ${LIBUSB_LIBRARIES})
 
 list(APPEND SRC_TEST_SCSI
         src/test/test_scsi.c
-        src/driver/dpf/dpf_device.c
-        src/driver/dpf/dpf_device.h
-        src/driver/dpf/warp_scsi.c
-        src/driver/dpf/warp_scsi.h
         src/utils/log.c
         src/utils/log.h
 )
 
-add_executable(test_scsi src/test/test_scsi.c ${SRC_TEST_SCSI})
+add_executable(test_scsi src/test/test_scsi.c ${SRC_TEST_SCSI} ${SRC_DPF_DRIVER})
 target_link_libraries(test_scsi ${LIBUSB_LIBRARIES})
\ No newline at end of file