align default data model with python test suite (partially)