Updated automatic test