Modified makefile to include tests