Automated tests fix