DFTesting switched to macroses