Writing basic tests for new Demand, tweaking Demand