Merge "Clean up test makefiles."