Merge "More test makefile cleanup."