Fix failing test
(cherry picked from commit a2f4ac7460674e2bfb5830bc4468ffe1e5496dd5)