Fix test cases that did not know about DEmpty