Updated makefile to run tests properly