Clean up test_config a bit, avoid duplication