Merge "Fix misc-macro-parentheses warnings in test macros."