Many testing tweaks.