DW: Updated the tests