FIX: ensure config is truly reloaded between tests
Add option to skip whitelisting