Merge "Clean up more test configurations (Part 2)."