DW: Correct failing tests