Adding in demo and tests