adding Test directory & changing Makefile