make consumption defaults work even if you pass in None
add support for overriding defaults in the consumption calc + tests