Token tests for Demand, and added a new Demand test class for validation state, etc.