[#4635] Fixing tests