Fix DFE tests