Add additional testcases for D/F conflicts