DW: Corrected the failing tests