Small refactoring

Small refactoring to instaniate hydrator only when needed
Update tests for settings service