Reservoir and Bitumen Heterogeneity in Athabasca Oil Sands*