Merge branch 'develop'
Merge branch 'develop'
Started to add new unit tests inside the module
Added unit tests
Remove application startup