DW: Finished the failing tests