Updated demo app and tests