diff --git a/cores/arduino/validation/build_gcc/test.mk b/cores/arduino/validation/build_gcc/test.mk
index efecb20c6c81291589a5c5cd84ca4e9759f20ab5..ec18a10b92315592ebf8790174d863e4ddedd709 100644
--- a/cores/arduino/validation/build_gcc/test.mk
+++ b/cores/arduino/validation/build_gcc/test.mk
@@ -25,13 +25,13 @@ VARIANT=arduino_zero
 endif
 
 ifeq ("$(VARIANT)", "arduino_zero")
-DEVICE=__SAMD21G18__
+DEVICE=__SAMD21G18A__
 endif
 
-ifeq ($(DEVICE), __SAMD21G18__)
+ifeq ($(DEVICE), __SAMD21G18A__)
 DEVICE_NAME=samd21g18
 DEVICE_SERIE=samd21
-else ifeq ($(DEVICE), __SAMD21J18__)
+else ifeq ($(DEVICE), __SAMD21J18A__)
 DEVICE_NAME=samd21j18
 DEVICE_SERIE=samd21
 endif
@@ -62,7 +62,7 @@ OUTPUT_PATH = debug_$(VARIANT)
 # Files
 #-------------------------------------------------------------------------------
 
-vpath %.cpp $(PROJECT_BASE_PATH)
+vpath %.cpp $(PROJECT_BASE_PATH) $(ARDUINO_CORE_PATH) $(VARIANT_PATH)
 vpath %.c $(ARDUINO_CORE_PATH) $(VARIANT_PATH)
 
 #VPATH+=$(PROJECT_BASE_PATH)
@@ -72,7 +72,7 @@ INCLUDES += -I$(ARDUINO_USB_PATH)
 INCLUDES += -I$(VARIANT_PATH)
 INCLUDES += -I$(CMSIS_ARM_PATH)
 INCLUDES += -I$(CMSIS_ATMEL_PATH)
-INCLUDES += -I$(CMSIS_DEVICE_PATH)
+#INCLUDES += -I$(CMSIS_DEVICE_PATH)
 
 #-------------------------------------------------------------------------------
 ifdef DEBUG
@@ -109,9 +109,10 @@ LIB_PATH+=-L=/lib/thumb2
 #-------------------------------------------------------------------------------
 # C source files and objects
 #-------------------------------------------------------------------------------
-C_SRC=$(wildcard $(PROJECT_BASE_PATH)/*.c)
-C_SRC+=$(wildcard $(ARDUINO_CORE_PATH)/*.c)
-C_SRC+=$(wildcard $(VARIANT_PATH)/*.c)
+C_SRC=
+#C_SRC+=$(wildcard $(PROJECT_BASE_PATH)/*.c)
+#C_SRC+=$(wildcard $(ARDUINO_CORE_PATH)/*.c)
+#C_SRC+=$(wildcard $(VARIANT_PATH)/*.c)
 
 C_OBJ_TEMP = $(patsubst %.c, %.o, $(notdir $(C_SRC)))
 
@@ -182,14 +183,16 @@ create_output:
 	@echo ------------------------------------------------------------------------------------
 
 $(addprefix $(OUTPUT_PATH)/,$(C_OBJ)): $(OUTPUT_PATH)/%.o: %.c
-	@echo Current folder is $(shell cd)
+	@echo Current folder is $(shell cd) - $@ $^
 #	@"$(CC)" -c $(CFLAGS) $< -o $@
-	"$(CC)" -v -c $(CFLAGS) $< -o $@
+#	"$(CC)" -v -c $(CFLAGS) $< -o $@
+	"$(CC)" -c $(CFLAGS) $< -o $@
 
 $(addprefix $(OUTPUT_PATH)/,$(CPP_OBJ)): $(OUTPUT_PATH)/%.o: %.cpp
-	@echo Current folder is $(shell cd)
+	@echo Current folder is $(shell cd) - $@ $^
 #	@"$(CXX)" -c $(CPPFLAGS) $< -o $@
-	"$(CXX)" -v -c $(CPPFLAGS) $< -o $@
+#	"$(CXX)" -v -c $(CPPFLAGS) $< -o $@
+	"$(CXX)" -c $(CPPFLAGS) $< -o $@
 
 $(OUTPUT_BIN): $(addprefix $(OUTPUT_PATH)/, $(C_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(CPP_OBJ)) $(addprefix $(OUTPUT_PATH)/, $(A_OBJ))
 	@"$(CC)" $(LIB_PATH) $(LDFLAGS) -T"$(VARIANT_PATH)/linker_scripts/gcc/flash.ld" -Wl,-Map,$(OUTPUT_PATH)/$@.map -o $(OUTPUT_PATH)/$@.elf $^ $(LIBS)
diff --git a/cores/arduino/validation/test.cpp b/cores/arduino/validation/test.cpp
index 7368c5aca44073f6b12325dd9251462babe8fc65..51bd56b405b97bad8327cb6cc74fcc93bede5238 100644
--- a/cores/arduino/validation/test.cpp
+++ b/cores/arduino/validation/test.cpp
@@ -18,6 +18,7 @@
 
 #include "Arduino.h"
 
+/*
 #ifdef _VARIANT_SAM3X_EK_
 #define MAX_ANALOG A0
 #elif defined _VARIANT_ARDUINO_DUE_X_
@@ -25,9 +26,11 @@
 #elif defined _VARIANT_ADK2_
 #define MAX_ANALOG A9
 #endif
+*/
 
 void setup( void )
 {
+/*
   // Initialize the digital pin as an output.
   // Pin PIN_LED has a LED connected on most Arduino boards:
   pinMode( PIN_LED, OUTPUT ) ;
@@ -38,46 +41,26 @@ void setup( void )
   digitalWrite( PIN_LED2, HIGH ) ;
 
   Serial1.begin( 115200 ) ;
+*/
 }
 
+/*
 static void led_step1( void )
 {
-#if defined sam3s_ek
-  digitalWrite( PIN_LED, HIGH ) ;  // set the LED on
-  digitalWrite( PIN_LED2, LOW ) ;   // set the red LED off
-#endif /* sam3s_ek */
-
-#if defined sam3u_ek
-  digitalWrite( PIN_LED, HIGH ) ;  // set the LED on
-  digitalWrite( PIN_LED2, LOW ) ;   // set the red LED off
-#endif /* sam3u_ek */
-
-#if defined arduino_due_x
   digitalWrite( PIN_LED, LOW ) ;  // set the LED on
   digitalWrite( PIN_LED2, LOW ) ;   // set the red LED off
-#endif /* arduino_due_x */
 }
 
 static void led_step2( void )
 {
-#if defined sam3s_ek
-  digitalWrite( PIN_LED, LOW ) ;   // set the LED off
-  digitalWrite( PIN_LED2, HIGH ) ;  // set the red LED on
-#endif /* sam3s_ek */
-
-#if defined sam3u_ek
-  digitalWrite( PIN_LED, LOW ) ;   // set the LED off
-  digitalWrite( PIN_LED2, HIGH ) ;  // set the red LED on
-#endif /* sam3u_ek */
-
-#if defined arduino_due_x
   digitalWrite( PIN_LED, HIGH ) ;   // set the LED off
   digitalWrite( PIN_LED2, HIGH ) ;  // set the red LED on
-#endif /* arduino_due_x */
 }
+*/
 
 void loop( void )
 {
+/*
   led_step1() ;
   delay( 1000 ) ;              // wait for a second
   led_step2() ;
@@ -95,4 +78,5 @@ void loop( void )
   }
   Serial1.println();
   delay(100);
+	*/
 }