More changes to Makefiles. clean commands now propogate properly to
the test Makefiles.