Update with first attempt on DW tests.