Updated tests (model only)