#1 dfc testing fixes