Rewrote the makefile for testing the samples