Commercial: tighten up DFP's tests