a couple more test tweaks