Two-phase flows involving capillary barriers in heterogeneous porous media