[RIC-571] Fix automation tests