Small refactor on configuration loader impl. and tests