Merge "Various run-test makefile fixes."