DW: resolved the failling tests