Added the modifled makefile and the test