Fixed style.
Fix a few JSON test examples
Merge remote-tracking branch 'origin/model_organism_dev' into 1458-treatment_type_enum_change