Fix case of false insufficient dice when WD covers it.
Plus some more testcase work.