Makefile and Tests Updated