Fix the tests.
Make the test runner account for Makefiles.