Test Fixes - ApplicationDisplayTemplates - macros