Update models according to the doc, including tests