refactoring test suite for doctor
refactoring test suite for doctor
refactor configuration handler
refactor configuration handler