Enhance testing for macro support