Work on default demo app & Input tests