DW: Modified the tests