Merge "Remove more Quick-related macros in tests."