More autotest tweaks.