Making unit tests work and added new Demand Set Methods.