Config tweaks for testing...