more test updates and tweaks