Altered Makefiles to get Paul's tests to run