Test Fixes - Portlet.macro - macros