Updated autotest