Adds demand plotting + tests