Unreviewed WPE gardening. Update test expectations and layout test baselines