DW: updated the failing tests