updated testing and makefile