Updating the makefile in preparation for using the new test suite.