Bring test_settings() up to date. #600