BS-7848 : Fix random tests