Updated Makefile to include tests