Fixing Broken Tests. Improves parse_config() a bit