Fix automatic tests