Enhance Configuration test coverage