few more test tweaks