Small cleanups
Cleanup config management in some tests