Test Fixes - portlet/nestedportlets