Updated demo and unit tests