Some cleanups around testing and default configs