Temp fix for config changes in tests (before a future fix that's better)