updated for new demo app and unit tests relocation