adapt some tests to 'better' wkt (followup b1efd479)