updated makefile and tests