Automatic tests fix