WW-4292 Solves problem with failing tests