Minor testing tweaks