some further minor test tweaks