Merge "Improve Test coverage of DFC Issue-ID: NONRTRIC-874"