DynamicConfigReader & Tests.
Source Cleanup