Updated Makefile and tests