Change makefile and test Build