Yet more reorganization of auto tests.