Merge pull request #1744 from dchill42/load_config_units

Loader and Config Unit Test Improvements