add ConfigProvider and UTs