Including Fine-Scale Capillary Heterogeneity in Modeling the Flow of CO2 and Brine in Reservoir Cores