More testing tweaks