Added 1st functional test and created an app
fixing merge conflicts