Rework test_config