Fixed the automation tests