Extended methodology for determining wetting properties of porous media