Fix automation tests