Expand test matrix for PE versions