And drop autotest too