Updated base makefile to include proper tests