updated models, test_models, settings

1. Updated models and test_models
2. Updated settings