Added demo and test sections