Merged test contributions for PORTLETSPEC5 from Mike Freedman