Editing makefiles and tests.