Fix failing tests (permanant fix)
(cherry picked from commit 0fc837138c63da0cc0eac6d73f42eeb0b39183f8)