Improve test mode and defaults