Merge "add unit test for DynamicConfigHandler"