Add Application example + tests refactored