more test tweaks