Added scaffolding for test and demo app