added app tests(#117), refactoring app evolution
added some basic app tests, refactoring