Update tests and data model