Fixes code completion testing conditions and timeouts
Updated portlet tests to test JPP6