Fix up settings for testing and local dev