diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 791ab5ebc6d11fb6c56afcbfb9815fa7c56e3412..a3898f63ec6cb17e9c6161c12fc10b09f72a7533 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -20,7 +20,7 @@ link_directories(
 add_executable(${PROJECT_NAME}_min test/min.c  lib/hal_mcu/hal_mcu.c)
 target_link_libraries(${PROJECT_NAME}_min uart_drv)
 
-add_executable(${PROJECT_NAME}_min2 test/min2.c lib/radio_drv/hal_spi_rf.c)
+add_executable(${PROJECT_NAME}_min2 test/min2.c lib/radio_drv/hal_spi_rf.c lib/radio_drv/cc1190_drv/cc1190_drv.c)
 target_link_libraries(${PROJECT_NAME}_min2 uart_drv hal_mcu)
 
 add_executable(${PROJECT_NAME}_rxer test/LaunchPad_trx_main.c test/LaunchPad_trx_demo.c)
diff --git a/source/test/min2.c b/source/test/min2.c
index 84533b03ab0c99a2fafbb86fb2aebf170f86bba1..4b8808dde8586dade96fd493be9c4fd80c463b76 100644
--- a/source/test/min2.c
+++ b/source/test/min2.c
@@ -6,6 +6,7 @@
 #include "lib/uart_drv/uart_drv.h"
 #include "lib/hal_mcu/hal_timer.h"
 #include "lib/radio_drv/cc112x_drv/cc112x_def.h"
+#include "lib/radio_drv/cc1190_drv/cc1190_drv.h"
 
 /******************************************************************************
  * LOCAL FUNCTIONS
@@ -188,26 +189,16 @@ void main (void)
 	preferredSettings = (registerSetting_t *)preferredSettings_50kbps;
 	bit_rate = 500;
 
-	//writeByte = 0x06;
-	/*writeByte = preferredSettings[0].data;
-	trx8BitRegAccess(RADIO_WRITE_ACCESS, preferredSettings[0].addr, &writeByte, 1);*/
-	/*i=0;
-	NOP();
-	if(preferredSettings[i].addr < 0x2F) {
-		writeByte = preferredSettings[i].data;
-		trx8BitRegAccess(RADIO_WRITE_ACCESS, preferredSettings[i].addr, &writeByte, 1);
-	}/*
 	/* Write registers to radio */
-		for(i = 0; i < preferredSettings_length; i++) {
-			NOP();
-			if(preferredSettings[i].addr < 0x2F) {
-				writeByte = preferredSettings[i].data;
-				trx8BitRegAccess(RADIO_WRITE_ACCESS, preferredSettings[i].addr, &writeByte, 1);
-			} else {
-				writeByte = preferredSettings[i].data;
-				trx16BitRegAccess(RADIO_WRITE_ACCESS, 0x2F , (0xFF & preferredSettings[i].addr),
-						&writeByte, 1);
-			}
+	for(i = 0; i < preferredSettings_length; i++) {
+		NOP(); //Optimisation workaround.
+		if(preferredSettings[i].addr < 0x2F) {
+			writeByte = preferredSettings[i].data;
+			trx8BitRegAccess(RADIO_WRITE_ACCESS, preferredSettings[i].addr, &writeByte, 1);
+		} else {
+			writeByte = preferredSettings[i].data;
+			trx16BitRegAccess(RADIO_WRITE_ACCESS, 0x2F , (0xFF & preferredSettings[i].addr),
+					&writeByte, 1);
 		}
 	while(1)
 	{