Fix several automation tests