Fixing ubuntu tests failures