further: 152-155 of that branch I think aren't strictly needed and a couple are in conflict with trunk because I fixed those skipped test in a different branch
further: 152-155 of that branch I think aren't strictly needed and a couple are in conflict with trunk because I fixed those skipped test in a different branch