minor test tweaks