Continual testing tweaks