More testing tweaks.