updated makefile and cpp test