fixed missing assignment in cp_override_requested()
Clean up overriding and default logic for cp_compute_consumption()
smarter preservation of true integer values
unit testing completed draft for consumption policy functions