Adding in demo and test