Merge "Fix test_get_config_file to always work"