Flow diagnostics, multi-phase flow and upscaling for discrete fracture-matrix simulations