Updated makefile for new tests