Test Fixes - Portlet - macros
Test Fixes - Portlet - tests