Cleaning the code

Removed unnecessary code, cleaned the unit test, corrected dependency injection implementation, StringLoader is exeternally supplied to Site class.
Merge branch 'feature-unit-test-refactoring' into develop