Merging fix to tests for config file includes