0011. Minor refactoring in Application project
0012. Some new test added in ApplicationTest project.